From f7f2c5d4c8a11175adfa0c7d2bd068383a574eea Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 30 Jun 2011 12:02:05 +0300 Subject: [PATCH] --- yaml --- r: 259715 b: refs/heads/master c: 85678d5d27cb0ea1005316f51b1b062bf4609b66 h: refs/heads/master i: 259713: 3fededec32317193763c73b34ac791c99b8792f0 259711: 4888685c2b0ae1bc25209faeca28c8eefda35d33 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/usbdux.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4f1945b04c78..7c40ab4b7868 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 880e96166c2cd1d84df0ccb02d413dcbf422796b +refs/heads/master: 85678d5d27cb0ea1005316f51b1b062bf4609b66 diff --git a/trunk/drivers/staging/comedi/drivers/usbdux.c b/trunk/drivers/staging/comedi/drivers/usbdux.c index 6637698e119a..bf62e0dd6f69 100644 --- a/trunk/drivers/staging/comedi/drivers/usbdux.c +++ b/trunk/drivers/staging/comedi/drivers/usbdux.c @@ -1465,6 +1465,7 @@ static int usbdux_ao_inttrig(struct comedi_device *dev, dev_err(&this_usbduxsub->interface->dev, "comedi%d: usbdux_ao_inttrig: invalid trignum\n", dev->minor); + up(&this_usbduxsub->sem); return -EINVAL; } if (!(this_usbduxsub->ao_cmd_running)) { @@ -2671,6 +2672,7 @@ static int usbdux_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (ret < 0) { dev_err(&udev->interface->dev, "comedi%d: error alloc space for subdev\n", dev->minor); + up(&udev->sem); up(&start_stop_sem); return ret; }