summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Haas <dev@sebastianhaas.info>2011-12-22 23:57:49 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-02-03 00:25:31 +0100
commitd0a71a7e6de0e0ce9f86c8ba6e13414a9df63e0b (patch)
tree650e1a68242a6bc949492359e50ede968ef27ff1
parent44b0052c5cb4e75389ed3eb9e98c29295a7dadfb (diff)
downloadop-kernel-dev-d0a71a7e6de0e0ce9f86c8ba6e13414a9df63e0b.zip
op-kernel-dev-d0a71a7e6de0e0ce9f86c8ba6e13414a9df63e0b.tar.gz
can: ems_usb: Removed double netif_device_detach
netif_device_attched is called twice when ems_usb_start fails with -ENODEV Signed-off-by: Sebastian Haas <dev@sebastianhaas.info> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/usb/ems_usb.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 9697c14..7dae64d 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -627,9 +627,6 @@ static int ems_usb_start(struct ems_usb *dev)
err = usb_submit_urb(urb, GFP_KERNEL);
if (err) {
- if (err == -ENODEV)
- netif_device_detach(dev->netdev);
-
usb_unanchor_urb(urb);
usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
urb->transfer_dma);
@@ -659,9 +656,6 @@ static int ems_usb_start(struct ems_usb *dev)
err = usb_submit_urb(dev->intr_urb, GFP_KERNEL);
if (err) {
- if (err == -ENODEV)
- netif_device_detach(dev->netdev);
-
dev_warn(netdev->dev.parent, "intr URB submit failed: %d\n",
err);
@@ -692,9 +686,6 @@ static int ems_usb_start(struct ems_usb *dev)
return 0;
failed:
- if (err == -ENODEV)
- netif_device_detach(dev->netdev);
-
dev_warn(netdev->dev.parent, "couldn't submit control: %d\n", err);
return err;
OpenPOWER on IntegriCloud