diff options
| author | Gary King <gking@nvidia.com> | 2010-06-09 10:03:57 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-06-09 10:09:00 -0700 |
| commit | 6ca6a37a8ca1e7bea727d052c3497e1b271e9e5b (patch) | |
| tree | ee44f60a2711d1d56ec43f27da22aebb6e4bd367 /drivers | |
| parent | ce506f897efd97d23be4b1d4c6be1e308e13d854 (diff) | |
usbnet: smsc9514: fix build break with USB_SUSPEND
ccf5b801c changed uintf.pm_usage_cnt to an atomic_t; update this driver
to reflect the change
bug 696988
Change-Id: If587ca9c98a7f92f35a0143283c6d13a862c3d6e
Reviewed-on: http://git-master/r/2336
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/smscusbnet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/usb/smscusbnet.c b/drivers/net/usb/smscusbnet.c index ab685fc33d83..67bed02595fa 100644 --- a/drivers/net/usb/smscusbnet.c +++ b/drivers/net/usb/smscusbnet.c @@ -1563,7 +1563,11 @@ int smscusbnet_start_xmit (struct sk_buff *skb, struct net_device *net) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)) #if defined(CONFIG_PM) && defined(CONFIG_USB_SUSPEND) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + if(atomic_read(&dev->uintf->pm_usage_cnt)<=0){ +#else if(dev->uintf->pm_usage_cnt <= 0){ +#endif netif_stop_queue (net); smscusbnet_defer_myevent(dev, EVENT_IDLE_RESUME); return NET_XMIT_DROP; |