Commit 6f44d7ff authored by Douglas Gilbert's avatar Douglas Gilbert Committed by Christoph Hellwig

[PATCH] 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
parent b1b782f7
...@@ -3137,14 +3137,14 @@ static int sbp2scsi_reset (Scsi_Cmnd *SCpnt) ...@@ -3137,14 +3137,14 @@ static int sbp2scsi_reset (Scsi_Cmnd *SCpnt)
/* /*
* Called by scsi stack to get bios parameters (used by fdisk, and at boot). * 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, 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 #else
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]) static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[])
{ {
sector_t capacy = disk->capacity; sector_t capacity = disk->capacity;
#endif #endif
int heads, sectors, cylinders; int heads, sectors, cylinders;
......
...@@ -552,7 +552,8 @@ void sbp2scsi_setup(char *str, int *ints); ...@@ -552,7 +552,8 @@ void sbp2scsi_setup(char *str, int *ints);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]); static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
#else #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 #endif
static int sbp2scsi_abort (Scsi_Cmnd *SCpnt); static int sbp2scsi_abort (Scsi_Cmnd *SCpnt);
static int sbp2scsi_reset (Scsi_Cmnd *SCpnt); static int sbp2scsi_reset (Scsi_Cmnd *SCpnt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment