Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361219
b: refs/heads/master
c: b5ae114
h: refs/heads/master
i:
  361217: 00fd88e
  361215: 137c05c
v: v3
  • Loading branch information
Kumar Amit Mehta authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 3f214b0 commit 249b99e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 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: 47b1be5c0f4ed4991f3d956dbd7ba69cb5bc521f
refs/heads/master: b5ae11463a67a5e468dd67482ab2308994da9b2b
27 changes: 17 additions & 10 deletions trunk/drivers/staging/comedi/drivers/usbduxsigma.c
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,11 @@ 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(16, GFP_KERNEL);
if (!local_transfer_buffer)
return -ENOMEM;

/* 7f92 to zero */
local_transfer_buffer[0] = 0;
Expand All @@ -702,19 +706,22 @@ 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(16, GFP_KERNEL);
if (!local_transfer_buffer)
return -ENOMEM;

/* 7f92 to one */
local_transfer_buffer[0] = 1;
Expand All @@ -732,12 +739,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 249b99e

Please sign in to comment.