From: H Hartley Sweeten Date: Mon, 24 Aug 2015 17:14:04 +0000 (-0700) Subject: staging: comedi: usbduxfast: remove unnecessary semaphore down/up X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7c79c014cba5694633ada77811ce14654dfb8227;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: usbduxfast: remove unnecessary semaphore down/up The semaphore down/up in usbduxfast_attach_common() is not necessary. This function is only called as part of the (*auto_attach) and does not talk to the USB device. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c index 9e846b43f54e..149b558a8896 100644 --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c @@ -842,17 +842,12 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev, static int usbduxfast_attach_common(struct comedi_device *dev) { - struct usbduxfast_private *devpriv = dev->private; struct comedi_subdevice *s; int ret; - down(&devpriv->sem); - ret = comedi_alloc_subdevices(dev, 1); - if (ret) { - up(&devpriv->sem); + if (ret) return ret; - } /* Analog Input subdevice */ s = &dev->subdevices[0]; @@ -868,8 +863,6 @@ static int usbduxfast_attach_common(struct comedi_device *dev) s->maxdata = 0x1000; /* 12-bit + 1 overflow bit */ s->range_table = &range_usbduxfast_ai_range; - up(&devpriv->sem); - return 0; }