[Gc-linux-cvs] linux/drivers/net/usb usbnet.c,1.5,1.6

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net/usb
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/net/usb

Modified Files:
	usbnet.c 
Log Message:
Merge gc-linux-v2.6.30.


Index: usbnet.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** usbnet.c	25 Oct 2009 18:45:36 -0000	1.5
--- usbnet.c	25 Oct 2009 18:50:27 -0000	1.6
***************
*** 516,520 ****
--- 516,522 ----
  		// during some PM-driven resume scenarios,
  		// these (async) unlinks complete immediately
+ 		spin_unlock(&q->lock);
  		retval = usb_unlink_urb (urb);
+ 		spin_lock(&q->lock);
  		if (retval != -EINPROGRESS && retval != 0)
  			devdbg (dev, "unlink urb err, %d", retval);