diff options
| author | Wolfgang Grandegger <wg@grandegger.com> | 2009-05-30 07:55:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-01 02:53:33 -0700 |
| commit | 128ced8f9d59bb3e36fbb4df87bd9d881f0a4463 (patch) | |
| tree | 38906e40b99eac8acd9e243701001ab8dc2e9b7b /drivers/net/can/sja1000 | |
| parent | 86d15cd83363a9787039895cb1a1b6be50f82ad3 (diff) | |
| download | blackbird-op-linux-128ced8f9d59bb3e36fbb4df87bd9d881f0a4463.tar.gz blackbird-op-linux-128ced8f9d59bb3e36fbb4df87bd9d881f0a4463.zip | |
can: some fixes and cleanups to the initial device driver interface
This patch fixes a few errors sneaked into the initial version of the
device driver interface.
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000')
| -rw-r--r-- | drivers/net/can/sja1000/ems_pci.c | 3 | ||||
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c index 3cd2ff9165e3..88a4649c2ced 100644 --- a/drivers/net/can/sja1000/ems_pci.c +++ b/drivers/net/can/sja1000/ems_pci.c @@ -218,14 +218,12 @@ static int __devinit ems_pci_add_card(struct pci_dev *pdev, card->conf_addr = pci_iomap(pdev, 0, EMS_PCI_MEM_SIZE); if (card->conf_addr == NULL) { err = -ENOMEM; - goto failure_cleanup; } card->base_addr = pci_iomap(pdev, 1, EMS_PCI_MEM_SIZE); if (card->base_addr == NULL) { err = -ENOMEM; - goto failure_cleanup; } @@ -239,7 +237,6 @@ static int __devinit ems_pci_add_card(struct pci_dev *pdev, ems_pci_readb(card, 3) != 0xCB || ems_pci_readb(card, 4) != 0x11) { dev_err(&pdev->dev, "Not EMS Dr. Thomas Wuensche interface\n"); - err = -ENODEV; goto failure_cleanup; } diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 05b38dde648e..b689964f182c 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -532,8 +532,8 @@ static int sja1000_open(struct net_device *dev) err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags, dev->name, (void *)dev); if (err) { - return -EAGAIN; close_candev(dev); + return -EAGAIN; } } |
