summaryrefslogtreecommitdiff
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-11-09 09:21:44 +0900
committerDavid S. Miller <davem@davemloft.net>2017-11-09 09:21:44 +0900
commit1a8e6b48fbf534028ce4031d0d035e7e72779cef (patch)
treec430fcd655ebf5887a7691893243b0e2ebf2e2b4 /drivers/net/usb
parent0de0add10e587effa880c741c9413c874f16be91 (diff)
Revert "net: usb: asix: fill null-ptr-deref in asix_suspend"
This reverts commit baedf68a068ca29624f241426843635920f16e1d. There is an updated version of this fix which covers the problem more thoroughly. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix_devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 743416be84f3..b2ff88e69a81 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -626,7 +626,7 @@ static int asix_suspend(struct usb_interface *intf, pm_message_t message)
struct usbnet *dev = usb_get_intfdata(intf);
struct asix_common_private *priv = dev->driver_priv;
- if (priv && priv->suspend)
+ if (priv->suspend)
priv->suspend(dev);
return usbnet_suspend(intf, message);