Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197413
b: refs/heads/master
c: 94c1f90
h: refs/heads/master
i:
  197411: 41a499e
v: v3
  • Loading branch information
Morgan Gatti authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 0a4ea3e commit 89f4d80
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: 6593dfacd3320c4f5fefd6e307ea5c6e9c5dac4f
refs/heads/master: 94c1f90bb0bac8c2b75569a247b89145022c4c24
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/usbdux.c
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ static int usbduxsub_stop(struct usbduxsub *usbduxsub)
}

static int usbduxsub_upload(struct usbduxsub *usbduxsub,
uint8_t * local_transfer_buffer,
uint8_t *local_transfer_buffer,
unsigned int startAddr, unsigned int len)
{
int errcode;
Expand Down Expand Up @@ -825,7 +825,7 @@ static int usbduxsub_upload(struct usbduxsub *usbduxsub,
#define FIRMWARE_MAX_LEN 0x2000

static int firmwareUpload(struct usbduxsub *usbduxsub,
const u8 * firmwareBinary, int sizeFirmware)
const u8 *firmwareBinary, int sizeFirmware)
{
int ret;
uint8_t *fwBuf;
Expand All @@ -835,7 +835,7 @@ static int firmwareUpload(struct usbduxsub *usbduxsub,

if (sizeFirmware > FIRMWARE_MAX_LEN) {
dev_err(&usbduxsub->interface->dev,
"comedi_: usbdux firmware binary it too large for FX2.\n");
"usbdux firmware binary it too large for FX2.\n");
return -ENOMEM;
}

Expand Down Expand Up @@ -1264,8 +1264,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
(this_usbduxsub->ai_interval) * 2;
}
this_usbduxsub->ai_timer = cmd->scan_begin_arg / (125000 *
(this_usbduxsub->
ai_interval));
(this_usbduxsub->
ai_interval));
} else {
/* interval always 1ms */
this_usbduxsub->ai_interval = 1;
Expand Down

0 comments on commit 89f4d80

Please sign in to comment.