diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-30 21:12:05 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-30 21:12:05 +0400 |
| commit | fed2c6fd1ffb7b24e55159eb40a5a7330be656c8 (patch) | |
| tree | 0b3ec505cbe89f0f026897e32b8bb73ffb6a5fd8 /drivers/net/can/usb/ems_usb.c | |
| parent | 481af03bfbc1e07954310689831ad2695b7c6a44 (diff) | |
| parent | 823d7a1f761d6404babaab04cc8b1724186cf2c8 (diff) | |
| download | linux-fed2c6fd1ffb7b24e55159eb40a5a7330be656c8.tar.xz | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this pull request is for net-next/master. There is a patch by Alexander
Stein fixing a reference counter problem which can make driver
unloading impossible (stable Cc'ed). And several patches by me which
remove an obsolete mechanism from several drivers, which is already
handled at the infrastructure level.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/usb/ems_usb.c')
| -rw-r--r-- | drivers/net/can/usb/ems_usb.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 086fa321677a..c69f0b72b352 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c @@ -245,7 +245,6 @@ struct ems_tx_urb_context { struct ems_usb { struct can_priv can; /* must be the first member */ - int open_time; struct sk_buff *echo_skb[MAX_TX_URBS]; @@ -728,7 +727,6 @@ static int ems_usb_open(struct net_device *netdev) return err; } - dev->open_time = jiffies; netif_start_queue(netdev); @@ -878,8 +876,6 @@ static int ems_usb_close(struct net_device *netdev) close_candev(netdev); - dev->open_time = 0; - return 0; } @@ -905,9 +901,6 @@ static int ems_usb_set_mode(struct net_device *netdev, enum can_mode mode) { struct ems_usb *dev = netdev_priv(netdev); - if (!dev->open_time) - return -EINVAL; - switch (mode) { case CAN_MODE_START: if (ems_usb_write_mode(dev, SJA1000_MOD_NORMAL)) |