Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 128ced8f authored by Wolfgang Grandegger's avatar Wolfgang Grandegger Committed by David S. Miller
Browse files

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: default avatarWolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86d15cd8

drivers/net/can/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int open_candev(struct net_device *dev) 


	return 0;

}

EXPORT_SYMBOL(open_candev);

EXPORT_SYMBOL_GPL(open_candev);



/*

 * Common close function for cleanup before the device gets closed.

drivers/net/can/sja1000/ems_pci.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/can/sja1000/sja1000.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

	}