diff --git a/common/usb_storage.c b/common/usb_storage.c
index dbe9cd9..fd116be 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -899,8 +899,12 @@
 	unsigned short smallblks;
 	struct usb_device *dev;
 	int retry,i;
-	ccb *srb=&usb_ccb;
-	device&=0xff;
+	ccb *srb = &usb_ccb;
+
+	if (blkcnt == 0)
+		return 0;
+
+	device &= 0xff;
 	/* Setup  device
 	 */
 	USB_STOR_PRINTF("\nusb_read: dev %d \n",device);