From 8ea669a36d7090196c58ead7bd8f4efc08e84e22 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 26 Jun 2012 18:01:51 -0700 Subject: [PATCH] --- yaml --- r: 317638 b: refs/heads/master c: b8ac8c63429e8b354067e3dcaa549dc0b53be5d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/cb_pcidas.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2fc626dfb23d..823faf996d45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3c34b2fc6ccc36f171633fa86b3d59a36792c25 +refs/heads/master: b8ac8c63429e8b354067e3dcaa549dc0b53be5d4 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c index a2901bb50e01..9f883dd77b34 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c @@ -1537,10 +1537,15 @@ static struct pci_dev *cb_pcidas_find_pci_device(struct comedi_device *dev, continue; } } + dev_dbg(dev->class_dev, + "Found %s on bus %i, slot %i\n", + thisboard->name, + pcidev->bus->number, PCI_SLOT(pcidev->devfn)); dev->board_ptr = thisboard; return pcidev; } } + dev_err(dev->class_dev, "No supported card found\n"); return NULL; } @@ -1558,15 +1563,9 @@ static int cb_pcidas_attach(struct comedi_device *dev, devpriv = dev->private; devpriv->pci_dev = cb_pcidas_find_pci_device(dev, it); - if (!devpriv->pci_dev) { - dev_err(dev->class_dev, "No supported card found\n"); + if (!devpriv->pci_dev) return -EIO; - } - thisboard = comedi_board(dev); - dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n", - thisboard->name, devpriv->pci_dev->bus->number, - PCI_SLOT(devpriv->pci_dev->devfn)); if (comedi_pci_enable(devpriv->pci_dev, "cb_pcidas")) { dev_err(dev->class_dev,