Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196966
b: refs/heads/master
c: 402a01a
h: refs/heads/master
v: v3
  • Loading branch information
Jason Wong authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 6136336 commit e723236
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 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: a41aec1be2b3b21c08b84fb1e70e23aab29c5820
refs/heads/master: 402a01ae2370e33aa67c483d136ca475756260f5
34 changes: 17 additions & 17 deletions trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ static int pci_dio_insn_bits_di_b(struct comedi_device *dev,
int i;

data[1] = 0;
for (i = 0; i < d->regs; i++) {
for (i = 0; i < d->regs; i++)
data[1] |= inb(dev->iobase + d->addr + i) << (8 * i);
}


return 2;
}
Expand Down Expand Up @@ -882,9 +882,9 @@ static int CheckAndAllocCard(struct comedi_device *dev,
struct pci_dio_private *pr, *prev;

for (pr = pci_priv, prev = NULL; pr != NULL; prev = pr, pr = pr->next) {
if (pr->pcidev == pcidev) {
if (pr->pcidev == pcidev)
return 0; /* this card is used, look for another */
}

}

if (prev) {
Expand Down Expand Up @@ -1040,22 +1040,22 @@ static int pci_dio_detach(struct comedi_device *dev)
int subdev;

if (dev->private) {
if (devpriv->valid) {
if (devpriv->valid)
pci_dio_reset(dev);
}


/* This shows the silliness of using this kind of
* scheme for numbering subdevices. Don't do it. --ds */
subdev = 0;
for (i = 0; i < MAX_DI_SUBDEVS; i++) {
if (this_board->sdi[i].chans) {
if (this_board->sdi[i].chans)
subdev++;
}

}
for (i = 0; i < MAX_DO_SUBDEVS; i++) {
if (this_board->sdo[i].chans) {
if (this_board->sdo[i].chans)
subdev++;
}

}
for (i = 0; i < MAX_DIO_SUBDEVG; i++) {
for (j = 0; j < this_board->sdio[i].regs; j++) {
Expand All @@ -1071,20 +1071,20 @@ static int pci_dio_detach(struct comedi_device *dev)
}

if (devpriv->pcidev) {
if (dev->iobase) {
if (dev->iobase)
comedi_pci_disable(devpriv->pcidev);
}

pci_dev_put(devpriv->pcidev);
}

if (devpriv->prev) {
if (devpriv->prev)
devpriv->prev->next = devpriv->next;
} else {
else
pci_priv = devpriv->next;
}
if (devpriv->next) {

if (devpriv->next)
devpriv->next->prev = devpriv->prev;
}

}

return 0;
Expand Down

0 comments on commit e723236

Please sign in to comment.