[Gc-linux-cvs] linux/drivers/net/usb usbnet.c,1.8,1.9

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

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

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


Index: usbnet.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** usbnet.c	25 Oct 2009 18:56:56 -0000	1.8
--- usbnet.c	25 Oct 2009 18:59:28 -0000	1.9
***************
*** 547,551 ****
--- 547,553 ----
  		// 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);