Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361216
b: refs/heads/master
c: d49c3d6
h: refs/heads/master
v: v3
  • Loading branch information
Kumar Amit Mehta authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 137c05c commit df21977
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 13 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: 6987a6dabfc40222ef767f67b57212fe3a0225fb
refs/heads/master: d49c3d61cfdb33165d2760817ec9601d277575d4
31 changes: 19 additions & 12 deletions trunk/drivers/staging/comedi/drivers/usbdux.c
Original file line number Diff line number Diff line change
Expand Up @@ -730,10 +730,14 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
static int usbduxsub_start(struct usbduxsub *usbduxsub)
{
int errcode = 0;
uint8_t local_transfer_buffer[16];
uint8_t *local_transfer_buffer;

local_transfer_buffer = kmalloc(1, GFP_KERNEL);
if (!local_transfer_buffer)
return -ENOMEM;

/* 7f92 to zero */
local_transfer_buffer[0] = 0;
*local_transfer_buffer = 0;
errcode = usb_control_msg(usbduxsub->usbdev,
/* create a pipe for a control transfer */
usb_sndctrlpipe(usbduxsub->usbdev, 0),
Expand All @@ -751,22 +755,25 @@ static int usbduxsub_start(struct usbduxsub *usbduxsub)
1,
/* Timeout */
BULK_TIMEOUT);
if (errcode < 0) {
if (errcode < 0)
dev_err(&usbduxsub->interface->dev,
"comedi_: control msg failed (start)\n");
return errcode;
}
return 0;

kfree(local_transfer_buffer);
return errcode;
}

static int usbduxsub_stop(struct usbduxsub *usbduxsub)
{
int errcode = 0;
uint8_t *local_transfer_buffer;

uint8_t local_transfer_buffer[16];
local_transfer_buffer = kmalloc(1, GFP_KERNEL);
if (!local_transfer_buffer)
return -ENOMEM;

/* 7f92 to one */
local_transfer_buffer[0] = 1;
*local_transfer_buffer = 1;
errcode = usb_control_msg(usbduxsub->usbdev,
usb_sndctrlpipe(usbduxsub->usbdev, 0),
/* bRequest, "Firmware" */
Expand All @@ -781,12 +788,12 @@ static int usbduxsub_stop(struct usbduxsub *usbduxsub)
1,
/* Timeout */
BULK_TIMEOUT);
if (errcode < 0) {
if (errcode < 0)
dev_err(&usbduxsub->interface->dev,
"comedi_: control msg failed (stop)\n");
return errcode;
}
return 0;

kfree(local_transfer_buffer);
return errcode;
}

static int usbduxsub_upload(struct usbduxsub *usbduxsub,
Expand Down

0 comments on commit df21977

Please sign in to comment.