Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186501
b: refs/heads/master
c: 71a74bd
h: refs/heads/master
i:
  186499: 84c8f91
v: v3
  • Loading branch information
Bruce Beare authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 9d28775 commit 7fc9759
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 90454a28d2e825e13f4a0334e017a438e4ccfc8a
refs/heads/master: 71a74bd951dd292dcda623539fa7b45005d72436
6 changes: 2 additions & 4 deletions trunk/drivers/staging/comedi/drivers/pcmad.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,8 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
data[n] = inb(dev->iobase + PCMAD_LSB);
data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8);

if (devpriv->twos_comp) {
if (devpriv->twos_comp)
data[n] ^= (1 << (this_board->n_ai_bits - 1));
}
}

return n;
Expand Down Expand Up @@ -168,9 +167,8 @@ static int pcmad_detach(struct comedi_device *dev)
{
printk("comedi%d: pcmad: remove\n", dev->minor);

if (dev->irq) {
if (dev->irq)
free_irq(dev->irq, dev);
}
if (dev->iobase)
release_region(dev->iobase, PCMAD_SIZE);

Expand Down

0 comments on commit 7fc9759

Please sign in to comment.