Skip to content

L
linux
Commit a7bf8426 authored by Alan Cox's avatar Alan Cox Committed by Dave Jones
Browse files
Options

[PATCH] u14f/34f build fix

parent 872663e0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
drivers/scsi/u14-34f.c
View file @ a7bf8426
...@@ -1486,16 +1486,16 @@ static int u14_34f_eh_host_reset(Scsi_Cmnd *SCarg) { ...@@ -1486,16 +1486,16 @@ static int u14_34f_eh_host_reset(Scsi_Cmnd *SCarg) {
return SUCCESS; return SUCCESS;
} }
static int u14_34f_bios_param(Disk *disk, struct block_device *bdev, static int u14_34f_bios_param(struct scsi_device *disk, struct block_device *bdev,
int *dkinfo) { sector_t capacity, int *dkinfo) {
unsigned int j = 0; unsigned int j = 0;
int size = disk->capacity; unsigned int size = capacity;
dkinfo[0] = HD(j)->heads; dkinfo[0] = HD(j)->heads;
dkinfo[1] = HD(j)->sectors; dkinfo[1] = HD(j)->sectors;
dkinfo[2] = size / (HD(j)->heads * HD(j)->sectors); dkinfo[2] = size / (HD(j)->heads * HD(j)->sectors);
if (ext_tran && (scsicam_bios_param(disk, bdev, dkinfo) < 0)) { if (ext_tran && (scsicam_bios_param(bdev, capacity, dkinfo) < 0)) {
dkinfo[0] = 255; dkinfo[0] = 255;
dkinfo[1] = 63; dkinfo[1] = 63;
dkinfo[2] = size / (dkinfo[0] * dkinfo[1]); dkinfo[2] = size / (dkinfo[0] * dkinfo[1]);
......
drivers/scsi/u14-34f.h
View file @ a7bf8426
...@@ -7,7 +7,7 @@ static int u14_34f_release(struct Scsi_Host *); ...@@ -7,7 +7,7 @@ static int u14_34f_release(struct Scsi_Host *);
static int u14_34f_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int u14_34f_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int u14_34f_eh_abort(Scsi_Cmnd *); static int u14_34f_eh_abort(Scsi_Cmnd *);
static int u14_34f_eh_host_reset(Scsi_Cmnd *); static int u14_34f_eh_host_reset(Scsi_Cmnd *);
static int u14_34f_bios_param(Disk *, struct block_device *, int *); static int u14_34f_bios_param(struct scsi_device *, struct block_device *, sector_t, int *);
static int u14_34f_slave_attach(Scsi_Device *); static int u14_34f_slave_attach(Scsi_Device *);
#define U14_34F_VERSION "8.00.00" #define U14_34F_VERSION "8.00.00"
...@@ -17,8 +17,6 @@ static int u14_34f_slave_attach(Scsi_Device *); ...@@ -17,8 +17,6 @@ static int u14_34f_slave_attach(Scsi_Device *);
detect: u14_34f_detect, \ detect: u14_34f_detect, \
release: u14_34f_release, \ release: u14_34f_release, \
queuecommand: u14_34f_queuecommand, \ queuecommand: u14_34f_queuecommand, \
abort: NULL, \
reset: NULL, \
eh_abort_handler: u14_34f_eh_abort, \ eh_abort_handler: u14_34f_eh_abort, \
eh_device_reset_handler: NULL, \ eh_device_reset_handler: NULL, \
eh_bus_reset_handler: NULL, \ eh_bus_reset_handler: NULL, \
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7