USB: fix up drivers the scsi people missed

drivers/usb/image/hpusbscsi.c

@@ -274,7 +274,7 @@ hpusbscsi_scsi_detect (struct SHT *sht)
 
 static int hpusbscsi_scsi_queuecommand (Scsi_Cmnd *srb, scsi_callback callback)
 {
-	struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->host->hostdata[0]);
+	struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->device->host->hostdata[0]);
 	usb_complete_t usb_callback;
 	int res;
 
@@ -349,7 +349,7 @@ static int hpusbscsi_scsi_queuecommand (Scsi_Cmnd *srb, scsi_callback callback)
 
 static int hpusbscsi_scsi_host_reset (Scsi_Cmnd *srb)
 {
-	struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->host->hostdata[0]);
+	struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->device->host->hostdata[0]);
 
 	printk(KERN_DEBUG"SCSI reset requested.\n");
 	//usb_reset_device(hpusbscsi->dev);
@@ -361,7 +361,7 @@ static int hpusbscsi_scsi_host_reset (Scsi_Cmnd *srb)
 
 static int hpusbscsi_scsi_abort (Scsi_Cmnd *srb)
 {
-	struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->host->hostdata[0]);
+	struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->device->host->hostdata[0]);
 	printk(KERN_DEBUG"Requested is canceled.\n");
 
 	usb_unlink_urb(hpusbscsi->dataurb);

drivers/usb/image/microtek.c

@@ -398,7 +398,7 @@ static int mts_scsi_release(struct Scsi_Host *psh)
 
 static int mts_scsi_abort (Scsi_Cmnd *srb)
 {
-	struct mts_desc* desc = (struct mts_desc*)(srb->host->hostdata[0]);
+	struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
 
 	MTS_DEBUG_GOT_HERE();
 
@@ -409,7 +409,7 @@ static int mts_scsi_abort (Scsi_Cmnd *srb)
 
 static int mts_scsi_host_reset (Scsi_Cmnd *srb)
 {
-	struct mts_desc* desc = (struct mts_desc*)(srb->host->hostdata[0]);
+	struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
 
 	MTS_DEBUG_GOT_HERE();
 	mts_debug_dump(desc);
@@ -692,7 +692,7 @@ mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc )
 static
 int mts_scsi_queuecommand( Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback )
 {
-	struct mts_desc* desc = (struct mts_desc*)(srb->host->hostdata[0]);
+	struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
 	int err = 0;
 	int res;