diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
| commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
| tree | e2b9804379a6aab3d2471898d257fe5590feb70c /drivers/usb/storage/scsiglue.c | |
| parent | c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (diff) | |
| parent | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (diff) | |
| download | blackbird-op-linux-e624ae8e0d4243e71daedce7570e91290438eaca.tar.gz blackbird-op-linux-e624ae8e0d4243e71daedce7570e91290438eaca.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
| -rw-r--r-- | drivers/usb/storage/scsiglue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index a688b1e686ea..689ee1fb702a 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -285,7 +285,7 @@ static int slave_configure(struct scsi_device *sdev) /* queue a command */ /* This is always called with scsi_lock(host) held */ -static int queuecommand(struct scsi_cmnd *srb, +static int queuecommand_lck(struct scsi_cmnd *srb, void (*done)(struct scsi_cmnd *)) { struct us_data *us = host_to_us(srb->device->host); @@ -315,6 +315,8 @@ static int queuecommand(struct scsi_cmnd *srb, return 0; } +static DEF_SCSI_QCMD(queuecommand) + /*********************************************************************** * Error handling functions ***********************************************************************/ |
