From 57206b928e76554f160c10a7d5f123e1e3f14048 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Fri, 20 Jul 2012 22:30:40 +0200 Subject: [PATCH] --- yaml --- r: 341647 b: refs/heads/master c: 823d7a1f761d6404babaab04cc8b1724186cf2c8 h: refs/heads/master i: 341645: 5a3167b91661d882c206e0f0554dc45b627422a4 341643: c8b55c9004072f0e507726a625be43284fbd32af 341639: 133cdf29b9abe522dfbd7d66df7552a6e03c7a92 341631: 09ad6d3c3ae413478d968964ea8fed223493fb42 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.c | 5 ----- trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8e1c22561be0..33b0884fead2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e42870465025ac6c9f3dc45f45a69d3da2d85308 +refs/heads/master: 823d7a1f761d6404babaab04cc8b1724186cf2c8 diff --git a/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.c index c4643c400d46..d9290ea788e0 100644 --- a/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.c @@ -520,7 +520,6 @@ static int peak_usb_ndo_open(struct net_device *netdev) return err; } - dev->open_time = jiffies; netif_start_queue(netdev); return 0; @@ -576,7 +575,6 @@ static int peak_usb_ndo_stop(struct net_device *netdev) close_candev(netdev); - dev->open_time = 0; dev->can.state = CAN_STATE_STOPPED; /* can set bus off now */ @@ -661,9 +659,6 @@ static int peak_usb_set_mode(struct net_device *netdev, enum can_mode mode) struct peak_usb_device *dev = netdev_priv(netdev); int err = 0; - if (!dev->open_time) - return -EINVAL; - switch (mode) { case CAN_MODE_START: err = peak_usb_restart(dev); diff --git a/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.h index c8e5e91d7cb5..073b47ff8eee 100644 --- a/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.h +++ b/trunk/drivers/net/can/usb/peak_usb/pcan_usb_core.h @@ -104,7 +104,6 @@ struct peak_usb_device { struct can_priv can; struct peak_usb_adapter *adapter; unsigned int ctrl_idx; - int open_time; u32 state; struct sk_buff *echo_skb[PCAN_USB_MAX_TX_URBS];