Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354437
b: refs/heads/master
c: 29d6dd3
h: refs/heads/master
i:
  354435: e819ffc
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent 729b2f8 commit 8a7d81d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 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: b105ad8a78456fbcdb81e98076e9c3813cdb0be0
refs/heads/master: 29d6dd3310641f7dc0dbd9b55f651eb9846f2aa6
7 changes: 0 additions & 7 deletions trunk/drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ struct vmk80xx_private {
unsigned char *usb_rx_buf;
unsigned char *usb_tx_buf;
unsigned long flags;
int attached;
};

static struct vmk80xx_private vmb[VMK80XX_MAX_BOARDS];
Expand Down Expand Up @@ -528,8 +527,6 @@ static int rudimentary_check(struct vmk80xx_private *devpriv, int dir)
{
if (!devpriv)
return -EFAULT;
if (!devpriv->attached)
return -ENODEV;
if (dir & DIR_IN) {
if (test_bit(TRANS_IN_BUSY, &devpriv->flags))
return -EBUSY;
Expand Down Expand Up @@ -1280,8 +1277,6 @@ static int vmk80xx_attach_common(struct comedi_device *dev,
s->insn_write = vmk80xx_pwm_winsn;
}

devpriv->attached = 1;

up(&devpriv->limit_sem);

return 0;
Expand All @@ -1300,8 +1295,6 @@ static int vmk80xx_auto_attach(struct comedi_device *dev,
break;
if (i == VMK80XX_MAX_BOARDS)
ret = -ENODEV;
else if (vmb[i].attached)
ret = -EBUSY;
else
ret = vmk80xx_attach_common(dev, &vmb[i]);
mutex_unlock(&glb_mutex);
Expand Down

0 comments on commit 8a7d81d

Please sign in to comment.