Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207967
b: refs/heads/master
c: 83a3ac8
h: refs/heads/master
i:
  207965: 3ab4690
  207963: 323640b
  207959: e6ec3e9
  207951: 578e898
  207935: 1dfc50f
v: v3
  • Loading branch information
Nicolas Kaiser authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 03ca5bc commit 162b4a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7244ce6530fc500a0d99cab0a110da7ff892e56
refs/heads/master: 83a3ac866d6931611d37ded24a2a2cc99fe36e9f
11 changes: 5 additions & 6 deletions trunk/drivers/usb/atm/cxacru.c
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static void cxacru_timeout_kill(unsigned long data)
}

static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
int* actual_length)
int *actual_length)
{
struct timer_list timer;

Expand Down Expand Up @@ -952,7 +952,7 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw,
put_unaligned(cpu_to_le32(addr), (__le32 *)(buf + offb));
offb += 4;
addr += l;
if(l)
if (l)
memcpy(buf + offb, data + offd, l);
if (l < stride)
memset(buf + offb + l, 0, stride - l);
Expand All @@ -967,7 +967,7 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw,
}
offb = 0;
}
} while(offd < size);
} while (offd < size);
dbg("sent fw %#x", fw);

ret = 0;
Expand Down Expand Up @@ -1043,8 +1043,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
if (instance->modem_type->boot_rom_patch) {
val = cpu_to_le32(BR_ADDR);
ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_STACK_ADDR, (u8 *) &val, 4);
}
else {
} else {
ret = cxacru_fw(usb_dev, FW_GOTO_MEM, 0x0, 0x0, FW_ADDR, NULL, 0);
}
if (ret) {
Expand All @@ -1068,7 +1067,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
}

static int cxacru_find_firmware(struct cxacru_data *instance,
char* phase, const struct firmware **fw_p)
char *phase, const struct firmware **fw_p)
{
struct usbatm_data *usbatm = instance->usbatm;
struct device *dev = &usbatm->usb_intf->dev;
Expand Down

0 comments on commit 162b4a6

Please sign in to comment.