~ubuntu-branches/ubuntu/quantal/linux-ti-omap4/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/usb/storage/cypress_atacb.c

  • Committer: Package Import Robot
  • Author(s): Brad Figg, Brad Figg
  • Date: 2013-06-08 09:09:23 UTC
  • Revision ID: package-import@ubuntu.com-20130608090923-ibtnp6edtrn3sxik
Tags: 3.5.0-226.39
[ Brad Figg ]

UBUNTU: Fixup missing abi files causing FTBS

Show diffs side-by-side

added added

removed removed

Lines of Context:
248
248
{
249
249
        struct us_data *us;
250
250
        int result;
 
251
        struct usb_device *device;
251
252
 
252
253
        result = usb_stor_probe1(&us, intf, id,
253
254
                        (id - cypress_usb_ids) + cypress_unusual_dev_list);
254
255
        if (result)
255
256
                return result;
256
257
 
257
 
        us->protocol_name = "Transparent SCSI with Cypress ATACB";
258
 
        us->proto_handler = cypress_atacb_passthrough;
 
258
        /* Among CY7C68300 chips, the A revision does not support Cypress ATACB
 
259
         * Filter out this revision from EEPROM default descriptor values
 
260
         */
 
261
        device = interface_to_usbdev(intf);
 
262
        if (device->descriptor.iManufacturer != 0x38 ||
 
263
            device->descriptor.iProduct != 0x4e ||
 
264
            device->descriptor.iSerialNumber != 0x64) {
 
265
                us->protocol_name = "Transparent SCSI with Cypress ATACB";
 
266
                us->proto_handler = cypress_atacb_passthrough;
 
267
        } else {
 
268
                us->protocol_name = "Transparent SCSI";
 
269
                us->proto_handler = usb_stor_transparent_scsi_command;
 
270
        }
259
271
 
260
272
        result = usb_stor_probe2(us);
261
273
        return result;