diff options
Diffstat (limited to 'drivers/usb/image/microtek.c')
| -rw-r--r-- | drivers/usb/image/microtek.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 5a47805d9580..c90c89dc0003 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
| @@ -364,7 +364,7 @@ static int mts_scsi_host_reset(struct scsi_cmnd *srb) | |||
| 364 | } | 364 | } |
| 365 | 365 | ||
| 366 | static int | 366 | static int |
| 367 | mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback); | 367 | mts_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *srb); |
| 368 | 368 | ||
| 369 | static void mts_transfer_cleanup( struct urb *transfer ); | 369 | static void mts_transfer_cleanup( struct urb *transfer ); |
| 370 | static void mts_do_sg(struct urb * transfer); | 370 | static void mts_do_sg(struct urb * transfer); |
| @@ -573,7 +573,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc) | |||
| 573 | 573 | ||
| 574 | 574 | ||
| 575 | static int | 575 | static int |
| 576 | mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback) | 576 | mts_scsi_queuecommand_lck(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback) |
| 577 | { | 577 | { |
| 578 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); | 578 | struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]); |
| 579 | int err = 0; | 579 | int err = 0; |
| @@ -626,6 +626,8 @@ out: | |||
| 626 | return err; | 626 | return err; |
| 627 | } | 627 | } |
| 628 | 628 | ||
| 629 | static DEF_SCSI_QCMD(mts_scsi_queuecommand) | ||
| 630 | |||
| 629 | static struct scsi_host_template mts_scsi_host_template = { | 631 | static struct scsi_host_template mts_scsi_host_template = { |
| 630 | .module = THIS_MODULE, | 632 | .module = THIS_MODULE, |
| 631 | .name = "microtekX6", | 633 | .name = "microtekX6", |
