diff options
Diffstat (limited to 'drivers/usb/atm/cxacru.c')
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 101ffc965ee0..593fc5e2d2e6 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -564,7 +564,7 @@ static void cxacru_timeout_kill(unsigned long data) | |||
| 564 | } | 564 | } |
| 565 | 565 | ||
| 566 | static int cxacru_start_wait_urb(struct urb *urb, struct completion *done, | 566 | static int cxacru_start_wait_urb(struct urb *urb, struct completion *done, |
| 567 | int* actual_length) | 567 | int *actual_length) |
| 568 | { | 568 | { |
| 569 | struct timer_list timer; | 569 | struct timer_list timer; |
| 570 | 570 | ||
| @@ -952,7 +952,7 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw, | |||
| 952 | put_unaligned(cpu_to_le32(addr), (__le32 *)(buf + offb)); | 952 | put_unaligned(cpu_to_le32(addr), (__le32 *)(buf + offb)); |
| 953 | offb += 4; | 953 | offb += 4; |
| 954 | addr += l; | 954 | addr += l; |
| 955 | if(l) | 955 | if (l) |
| 956 | memcpy(buf + offb, data + offd, l); | 956 | memcpy(buf + offb, data + offd, l); |
| 957 | if (l < stride) | 957 | if (l < stride) |
| 958 | memset(buf + offb + l, 0, stride - l); | 958 | memset(buf + offb + l, 0, stride - l); |
| @@ -967,7 +967,7 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw, | |||
| 967 | } | 967 | } |
| 968 | offb = 0; | 968 | offb = 0; |
| 969 | } | 969 | } |
| 970 | } while(offd < size); | 970 | } while (offd < size); |
| 971 | dbg("sent fw %#x", fw); | 971 | dbg("sent fw %#x", fw); |
| 972 | 972 | ||
| 973 | ret = 0; | 973 | ret = 0; |
| @@ -1043,8 +1043,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance, | |||
| 1043 | if (instance->modem_type->boot_rom_patch) { | 1043 | if (instance->modem_type->boot_rom_patch) { |
| 1044 | val = cpu_to_le32(BR_ADDR); | 1044 | val = cpu_to_le32(BR_ADDR); |
| 1045 | ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_STACK_ADDR, (u8 *) &val, 4); | 1045 | ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_STACK_ADDR, (u8 *) &val, 4); |
| 1046 | } | 1046 | } else { |
| 1047 | else { | ||
| 1048 | ret = cxacru_fw(usb_dev, FW_GOTO_MEM, 0x0, 0x0, FW_ADDR, NULL, 0); | 1047 | ret = cxacru_fw(usb_dev, FW_GOTO_MEM, 0x0, 0x0, FW_ADDR, NULL, 0); |
| 1049 | } | 1048 | } |
| 1050 | if (ret) { | 1049 | if (ret) { |
| @@ -1068,7 +1067,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance, | |||
| 1068 | } | 1067 | } |
| 1069 | 1068 | ||
| 1070 | static int cxacru_find_firmware(struct cxacru_data *instance, | 1069 | static int cxacru_find_firmware(struct cxacru_data *instance, |
| 1071 | char* phase, const struct firmware **fw_p) | 1070 | char *phase, const struct firmware **fw_p) |
| 1072 | { | 1071 | { |
| 1073 | struct usbatm_data *usbatm = instance->usbatm; | 1072 | struct usbatm_data *usbatm = instance->usbatm; |
| 1074 | struct device *dev = &usbatm->usb_intf->dev; | 1073 | struct device *dev = &usbatm->usb_intf->dev; |
