adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-02 14:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

can: some fixes and cleanups to the initial device driver interface

Browse source 
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>
This commit is contained in:
Wolfgang Grandegger 2009-05-30 07:55:48 +00:00 committed by David S. Miller
parent 86d15cd833
commit 128ced8f9d
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/can/dev.c
View file

@ -477,7 +477,7 @@ int open_candev(struct net_device *dev)
return 0; return 0;
} }
EXPORT_SYMBOL(open_candev); EXPORT_SYMBOL_GPL(open_candev);
/* /*
* Common close function for cleanup before the device gets closed. * Common close function for cleanup before the device gets closed.

3
drivers/net/can/sja1000/ems_pci.c
View file

@ -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); card->conf_addr = pci_iomap(pdev, 0, EMS_PCI_MEM_SIZE);
if (card->conf_addr == NULL) { if (card->conf_addr == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto failure_cleanup; goto failure_cleanup;
} }
card->base_addr = pci_iomap(pdev, 1, EMS_PCI_MEM_SIZE); card->base_addr = pci_iomap(pdev, 1, EMS_PCI_MEM_SIZE);
if (card->base_addr == NULL) { if (card->base_addr == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto failure_cleanup; 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, 3) != 0xCB ||
ems_pci_readb(card, 4) != 0x11) { ems_pci_readb(card, 4) != 0x11) {
dev_err(&pdev->dev, "Not EMS Dr. Thomas Wuensche interface\n"); dev_err(&pdev->dev, "Not EMS Dr. Thomas Wuensche interface\n");
err = -ENODEV; err = -ENODEV;
goto failure_cleanup; goto failure_cleanup;
} }

2
drivers/net/can/sja1000/sja1000.c
View file

@ -532,8 +532,8 @@ static int sja1000_open(struct net_device *dev)
err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags, err = request_irq(dev->irq, &sja1000_interrupt, priv->irq_flags,
dev->name, (void *)dev); dev->name, (void *)dev);
if (err) { if (err) {
return -EAGAIN;
close_candev(dev); close_candev(dev);
return -EAGAIN;
} }
} }