diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/usb/misc/isight_firmware.c | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/usb/misc/isight_firmware.c')
| -rw-r--r-- | drivers/usb/misc/isight_firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index 9f30aa1f8a5d..d94aa7387608 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c | |||
| @@ -41,7 +41,7 @@ static int isight_firmware_load(struct usb_interface *intf, | |||
| 41 | const struct firmware *firmware; | 41 | const struct firmware *firmware; |
| 42 | unsigned char *buf = kmalloc(50, GFP_KERNEL); | 42 | unsigned char *buf = kmalloc(50, GFP_KERNEL); |
| 43 | unsigned char data[4]; | 43 | unsigned char data[4]; |
| 44 | u8 *ptr; | 44 | const u8 *ptr; |
| 45 | 45 | ||
| 46 | if (!buf) | 46 | if (!buf) |
| 47 | return -ENOMEM; | 47 | return -ENOMEM; |