Skip to contentSkip to conversation

sbp2 (ieee1394) for lk2.5.44-bk3

PATCH New Douglas Gilbert 1 participant 1 message Oct 31, 2002 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sbp2 (ieee1394) for lk2.5.44-bk3

This firewire mass storage driver is broken by the biosparam changes. Small hack in patch below so it will compile in 2.5.44 (was set up anticipating 2.5.45 but would not have compiled).

Doug Gilbert

drivers/ieee1394/sbp2.h2544bk3fix renamed from drivers/ieee1394/sbp2.h +0 -0
@@ -552,7 +552,8 @@

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]); #else
-static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device *dev, int geom[]);
+static int sbp2scsi_biosparam (struct scsi_device *sdev, + struct block_device *dev, sector_t capacy, int geom[]);
#endif
static int sbp2scsi_abort (Scsi_Cmnd *SCpnt); static int sbp2scsi_reset (Scsi_Cmnd *SCpnt); --- linux/drivers/ieee1394/sbp2.c 2002-10-31 09:22:50.000000000 +1100
+++ linux/drivers/ieee1394/sbp2.c2544bk3fix 2002-10-31 11:30:20.000000000 +1100
@@ -3137,14 +3137,14 @@
/*
* Called by scsi stack to get bios parameters (used by fdisk, and at boot). */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,43)
static int sbp2scsi_biosparam (struct scsi_device *sdev,
- struct block_device *dev, sector_t capacy, int geom[]) + struct block_device *dev, sector_t capacity, int geom[]) {
#else
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]) {
- sector_t capacy = disk->capacity;
+ sector_t capacity = disk->capacity;

#endif
	int heads, sectors, cylinders;