diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-07 20:09:18 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-07 20:09:18 -0400 |
| commit | bf02f5d2c080cf61b770e09add602ca360d538fb (patch) | |
| tree | 1899f41554f8778a4cc1860adb53c95deaedaafb /drivers/staging/comedi | |
| parent | 4b899da50dcf1a7850715650281b5d76af8a5eb4 (diff) | |
| parent | 2c563880ea8fdc900693ae372fa07b3894f8ff63 (diff) | |
Merge commit '2c563880ea' into work.xattr
pick xattr_handler conversion from lustre tree
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/usbduxfast.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c index 10f94ec34536..608403c7586b 100644 --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c @@ -946,10 +946,8 @@ static int usbduxfast_auto_attach(struct comedi_device *dev, } devpriv->urb = usb_alloc_urb(0, GFP_KERNEL); - if (!devpriv->urb) { - dev_err(dev->class_dev, "Could not alloc. urb\n"); + if (!devpriv->urb) return -ENOMEM; - } devpriv->inbuf = kmalloc(SIZEINBUF, GFP_KERNEL); if (!devpriv->inbuf) |