aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/dev.c2
-rw-r--r--drivers/net/can/sja1000/ems_pci.c3
-rw-r--r--drivers/net/can/sja1000/sja1000.c2
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 52b0e7d8901d..574daddc21bf 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -477,7 +477,7 @@ int open_candev(struct net_device *dev)
477 477
478 return 0; 478 return 0;
479} 479}
480EXPORT_SYMBOL(open_candev); 480EXPORT_SYMBOL_GPL(open_candev);
481 481
482/* 482/*
483 * Common close function for cleanup before the device gets closed. 483 * Common close function for cleanup before the device gets closed.
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,
218 card->conf_addr = pci_iomap(pdev, 0, EMS_PCI_MEM_SIZE); 218 card->conf_addr = pci_iomap(pdev, 0, EMS_PCI_MEM_SIZE);
219 if (card->conf_addr == NULL) { 219 if (card->conf_addr == NULL) {
220 err = -ENOMEM; 220 err = -ENOMEM;
221
222 goto failure_cleanup; 221 goto failure_cleanup;
223 } 222 }
224 223
225 card->base_addr = pci_iomap(pdev, 1, EMS_PCI_MEM_SIZE); 224 card->base_addr = pci_iomap(pdev, 1, EMS_PCI_MEM_SIZE);
226 if (card->base_addr == NULL) { 225 if (card->base_addr == NULL) {
227 err = -ENOMEM; 226 err = -ENOMEM;
228
229 goto failure_cleanup; 227 goto failure_cleanup;
230 } 228 }
231 229
@@ -239,7 +237,6 @@ static int __devinit ems_pci_add_card(struct pci_dev *pdev,
239 ems_pci_readb(card, 3) != 0xCB || 237 ems_pci_readb(card, 3) != 0xCB ||
240 ems_pci_readb(card, 4) != 0x11) { 238 ems_pci_readb(card, 4) != 0x11) {
241 dev_err(&pdev->dev, "Not EMS Dr. Thomas Wuensche interface\n"); 239 dev_err(&pdev->dev, "Not EMS Dr. Thomas Wuensche interface\n");
242
243 err = -ENODEV; 240 err = -ENODEV;
244 goto failure_cleanup; 241 goto failure_cleanup;
245 } 242 }
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)
532 err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags, 532 err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags,
533 dev->name, (void *)dev); 533 dev->name, (void *)dev);
534 if (err) { 534 if (err) {
535 return -EAGAIN;
536 close_candev(dev); 535 close_candev(dev);
536 return -EAGAIN;
537 } 537 }
538 } 538 }
539 539