aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-ep93xx.c2
-rw-r--r--drivers/usb/storage/transport.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index fb3055f084b5..7cf74f8c2db1 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -28,8 +28,6 @@
28#include <linux/signal.h> 28#include <linux/signal.h>
29#include <linux/platform_device.h> 29#include <linux/platform_device.h>
30 30
31#include <mach/hardware.h>
32
33static struct clk *usb_host_clock; 31static struct clk *usb_host_clock;
34 32
35static void ep93xx_start_hc(struct device *dev) 33static void ep93xx_start_hc(struct device *dev)
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index d48c8553539d..49aedb36dc19 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -787,7 +787,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
787 /* Did we transfer less than the minimum amount required? */ 787 /* Did we transfer less than the minimum amount required? */
788 if ((srb->result == SAM_STAT_GOOD || srb->sense_buffer[2] == 0) && 788 if ((srb->result == SAM_STAT_GOOD || srb->sense_buffer[2] == 0) &&
789 scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow) 789 scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow)
790 srb->result = (DID_ERROR << 16) | (SUGGEST_RETRY << 24); 790 srb->result = DID_ERROR << 16;
791 791
792 last_sector_hacks(us, srb); 792 last_sector_hacks(us, srb);
793 return; 793 return;