[Gc-linux-cvs] linux/drivers/net/usb usbnet.c,1.11,1.12

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

Update of /cvsroot/gc-linux/linux/drivers/net/usb
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/net/usb

Modified Files:
	usbnet.c 
Log Message:
Merge v2.6.32.

Index: usbnet.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** usbnet.c	9 Dec 2009 18:40:10 -0000	1.11
--- usbnet.c	9 Dec 2009 18:44:55 -0000	1.12
***************
*** 587,591 ****
--- 587,593 ----
  		// 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);