Merge branch 'upstream-fixes'

[linux-2.6-omap-h63xx.git] / drivers / scsi / a100u2w.c

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index c34403c30483ebb56fe8d21b4d2374c73cffd940..9f45ae1745da7eb0a8190a9a9b84d4f35d099b6c 100644 (file)
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -923,7 +923,7 @@ static int inia100_device_reset(struct scsi_cmnd * SCpnt)
 {                              /* I need Host Control Block Information */
        ORC_HCS *pHCB;
        pHCB = (ORC_HCS *) SCpnt->device->host->hostdata;
-       return orc_device_reset(pHCB, SCpnt, SCpnt->device->id);
+       return orc_device_reset(pHCB, SCpnt, scmd_id(SCpnt));
 
 }