]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Revert "net: usb: asix: fill null-ptr-deref in asix_suspend"
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Nov 2017 00:21:44 +0000 (09:21 +0900)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Nov 2017 00:21:44 +0000 (09:21 +0900)
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>
drivers/net/usb/asix_devices.c

index 743416be84f327a49620b60a06a15e3b0051fd4c..b2ff88e69a819cc3098a720ece238d8847d6be57 100644 (file)
@@ -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);