Merge tag 'upstream-3.7-rc1-fastmap' of git://git.infradead.org/linux-ubi

[~andy/linux] / drivers / usb / storage / cypress_atacb.c

diff --git a/drivers/usb/storage/cypress_atacb.c b/drivers/usb/storage/cypress_atacb.c
index 5fe451d16e6870968ec4dbfc084d37e1e055a361..070b5c0ebbf98d0d822723c4fe04b9ee984c5bf5 100644 (file)
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -41,7 +41,7 @@ MODULE_LICENSE("GPL");
                    vendorName, productName, useProtocol, useTransport, \
                    initFunction, flags) \
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
-  .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
+  .driver_info = (flags) }
 
 static struct usb_device_id cypress_usb_ids[] = {
 #      include "unusual_cypress.h"