diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
| commit | 6528209ba2c94f3a0ef946b7d808d9a15b30ec50 (patch) | |
| tree | c3c1b8bcf8ae19f411c53c2f199f923742bcc256 /drivers/usb/misc/isight_firmware.c | |
| parent | a056fb3687c40b8a1123de1586f491285cb5fb1f (diff) | |
| parent | f2ab2a127d480ee20caf8620440ccf13c014447a (diff) | |
Merge remote branch 'stable/linux-2.6.32.y' into 2.6.32-mantismedia/2.6.32-mantis
Diffstat (limited to 'drivers/usb/misc/isight_firmware.c')
| -rw-r--r-- | drivers/usb/misc/isight_firmware.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index b897f6554ec..6199f12d014 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c @@ -54,8 +54,9 @@ static int isight_firmware_load(struct usb_interface *intf, ptr = firmware->data; + buf[0] = 0x01; if (usb_control_msg - (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\1", 1, + (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, buf, 1, 300) != 1) { printk(KERN_ERR "Failed to initialise isight firmware loader\n"); @@ -99,8 +100,9 @@ static int isight_firmware_load(struct usb_interface *intf, } } + buf[0] = 0x00; if (usb_control_msg - (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\0", 1, + (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, buf, 1, 300) != 1) { printk(KERN_ERR "isight firmware loading completion failed\n"); ret = -ENODEV; |