usbatm cxacru.c,1.28,1.29

[kagan at infradead.org]

Update of /home/cvs/usbatm
In directory phoenix.infradead.org:/tmp/cvs-serv25024

Modified Files:
	cxacru.c 
Log Message:
Make sure the delayed work is actually cancelled and flushed.

Index: cxacru.c
===================================================================
RCS file: /home/cvs/usbatm/cxacru.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cxacru.c	22 Apr 2005 09:09:24 -0000	1.28
+++ cxacru.c	22 Apr 2005 09:59:31 -0000	1.29
@@ -756,9 +756,8 @@
 		return;
 	}
 
-	cancel_delayed_work(&instance->poll_work);
-	wmb();
-	flush_scheduled_work();
+	while (!cancel_delayed_work(&instance->poll_work))
+	       flush_scheduled_work();
 
 	usb_kill_urb(instance->snd_urb);
 	usb_kill_urb(instance->rcv_urb);