diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:14:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:14:22 -0400 |
commit | b50df7d1fb37eb6aea87590b391d7111fde87121 (patch) | |
tree | 9ec6e10ffcbb9433128d97ab1bc1a50ff8dea088 /drivers/uwb/i1480 | |
parent | 352d4657b23fbd329efccc396000a549e0150907 (diff) | |
parent | bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
uwb: remove duplicate cpu_to_le16()
uwb: declare MODULE_FIRMWARE() in i1480 DFU driver
uwb: make USB device id table constant
uwb: wlp: refactor wlp_get_<attribute>() macros
Diffstat (limited to 'drivers/uwb/i1480')
-rw-r--r-- | drivers/uwb/i1480/dfu/usb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index 0bb665a0c024..a99e211a1b87 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
@@ -120,8 +120,7 @@ int i1480_usb_write(struct i1480 *i1480, u32 memory_address, | |||
120 | result = usb_control_msg( | 120 | result = usb_control_msg( |
121 | i1480_usb->usb_dev, usb_sndctrlpipe(i1480_usb->usb_dev, 0), | 121 | i1480_usb->usb_dev, usb_sndctrlpipe(i1480_usb->usb_dev, 0), |
122 | 0xf0, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 122 | 0xf0, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
123 | cpu_to_le16(memory_address & 0xffff), | 123 | memory_address, (memory_address >> 16), |
124 | cpu_to_le16((memory_address >> 16) & 0xffff), | ||
125 | i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */); | 124 | i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */); |
126 | if (result < 0) | 125 | if (result < 0) |
127 | break; | 126 | break; |
@@ -166,8 +165,7 @@ int i1480_usb_read(struct i1480 *i1480, u32 addr, size_t size) | |||
166 | result = usb_control_msg( | 165 | result = usb_control_msg( |
167 | i1480_usb->usb_dev, usb_rcvctrlpipe(i1480_usb->usb_dev, 0), | 166 | i1480_usb->usb_dev, usb_rcvctrlpipe(i1480_usb->usb_dev, 0), |
168 | 0xf0, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 167 | 0xf0, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
169 | cpu_to_le16(itr_addr & 0xffff), | 168 | itr_addr, (itr_addr >> 16), |
170 | cpu_to_le16((itr_addr >> 16) & 0xffff), | ||
171 | i1480->cmd_buf + itr, itr_size, | 169 | i1480->cmd_buf + itr, itr_size, |
172 | 100 /* FIXME: arbitrary */); | 170 | 100 /* FIXME: arbitrary */); |
173 | if (result < 0) { | 171 | if (result < 0) { |
@@ -413,6 +411,10 @@ error: | |||
413 | return result; | 411 | return result; |
414 | } | 412 | } |
415 | 413 | ||
414 | MODULE_FIRMWARE("i1480-pre-phy-0.0.bin"); | ||
415 | MODULE_FIRMWARE("i1480-usb-0.0.bin"); | ||
416 | MODULE_FIRMWARE("i1480-phy-0.0.bin"); | ||
417 | |||
416 | #define i1480_USB_DEV(v, p) \ | 418 | #define i1480_USB_DEV(v, p) \ |
417 | { \ | 419 | { \ |
418 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE \ | 420 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE \ |
@@ -430,7 +432,7 @@ error: | |||
430 | 432 | ||
431 | 433 | ||
432 | /** USB device ID's that we handle */ | 434 | /** USB device ID's that we handle */ |
433 | static struct usb_device_id i1480_usb_id_table[] = { | 435 | static const struct usb_device_id i1480_usb_id_table[] = { |
434 | i1480_USB_DEV(0x8086, 0xdf3b), | 436 | i1480_USB_DEV(0x8086, 0xdf3b), |
435 | i1480_USB_DEV(0x15a9, 0x0005), | 437 | i1480_USB_DEV(0x15a9, 0x0005), |
436 | i1480_USB_DEV(0x07d1, 0x3802), | 438 | i1480_USB_DEV(0x07d1, 0x3802), |