2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index e80362d148f3..a1128ff5cc2c 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -253,6 +253,10 @@ static int slave_configure(struct scsi_device *sdev)
                  * or to force 192-byte transfer lengths for MODE SENSE.
                  * But they do need to use MODE SENSE(10). */
                 sdev->use_10_for_ms = 1;
+
+                /* Some (fake) usb cdrom devices don't like READ_DISC_INFO */
+                if (us->fflags & US_FL_NO_READ_DISC_INFO)
+                        sdev->no_read_disc_info = 1;
         }
 
         /* The CB and CBI transports have no way to pass LUN values
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index f43314a22ba4..c8264ff5457e 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1858,6 +1858,11 @@ UNUSUAL_DEV( 0x1908, 0x1320, 0x0000, 0x0000,
                 "Photo Frame",
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_BAD_SENSE ),
+UNUSUAL_DEV( 0x1908, 0x3335, 0x0200, 0x0200,
+                "BUILDWIN",
+                "Photo Frame",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_NO_READ_DISC_INFO ),
 
 UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,
                 "ST",