Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361217
b: refs/heads/master
c: 161f440
h: refs/heads/master
i:
  361215: 137c05c
v: v3
  • Loading branch information
Kumar Amit Mehta authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent df21977 commit 00fd88e
Show file tree
Hide file tree
Showing 2 changed files with 19 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: d49c3d61cfdb33165d2760817ec9601d277575d4
refs/heads/master: 161f440c8d915181b34f5a64f52a543beca6b1e9
30 changes: 18 additions & 12 deletions trunk/drivers/staging/comedi/drivers/usbduxfast.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,14 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
{
int ret;
unsigned char local_transfer_buffer[16];
unsigned char *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;
/* bRequest, "Firmware" */
ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
USBDUXFASTSUB_FIRMWARE,
Expand All @@ -450,22 +454,25 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
local_transfer_buffer,
1, /* Length */
EZTIMEOUT); /* Timeout */
if (ret < 0) {
if (ret < 0)
dev_err(&udfs->interface->dev,
"control msg failed (start)\n");
return ret;
}

return 0;
kfree(local_transfer_buffer);
return ret;
}

static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
{
int ret;
unsigned char local_transfer_buffer[16];
unsigned char *local_transfer_buffer;

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;
/* bRequest, "Firmware" */
ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
USBDUXFASTSUB_FIRMWARE,
Expand All @@ -474,13 +481,12 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
0x0000, /* Index */
local_transfer_buffer, 1, /* Length */
EZTIMEOUT); /* Timeout */
if (ret < 0) {
if (ret < 0)
dev_err(&udfs->interface->dev,
"control msg failed (stop)\n");
return ret;
}

return 0;
kfree(local_transfer_buffer);
return ret;
}

static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
Expand Down

0 comments on commit 00fd88e

Please sign in to comment.