1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index ee85c8b9a858..ed1b43210584 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -203,7 +203,7 @@ static inline void sierra_net_set_private(struct usbnet *dev,
 /* is packet IPv4 */
 static inline int is_ip(struct sk_buff *skb)
 {
-        return (skb->protocol == cpu_to_be16(ETH_P_IP));
+        return skb->protocol == cpu_to_be16(ETH_P_IP);
 }
 
 /*
@@ -354,7 +354,7 @@ static void sierra_net_set_ctx_index(struct sierra_net_data *priv, u8 ctx_ix)
 
 static inline int sierra_net_is_valid_addrlen(u8 len)
 {
-        return (len == sizeof(struct in_addr));
+        return len == sizeof(struct in_addr);
 }
 
 static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
@@ -802,10 +802,9 @@ static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf)
 
         dev_dbg(&dev->udev->dev, "%s", __func__);
 
-        /* Kill the timer then flush the work queue */
+        /* kill the timer and work */
         del_timer_sync(&priv->sync_timer);
-
-        flush_scheduled_work();
+        cancel_work_sync(&priv->sierra_net_kevent);
 
         /* tell modem we are going away */
         status = sierra_net_send_cmd(dev, priv->shdwn_msg,