[src/trunk]: src/sys/dev/usb Check that the xfer we are about to abort didn't...

[aymeric <aymeric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d824f578542f
branches:  trunk
changeset: 789571:d824f578542f
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Thu Aug 22 20:00:43 2013 +0000

description:
Check that the xfer we are about to abort didn't finish yet since abort
methods fail in this case (at least ehci's one).

diffstat:

 sys/dev/usb/usbdi.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 13acc2d31e27 -r d824f578542f sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Thu Aug 22 19:50:54 2013 +0000
+++ b/sys/dev/usb/usbdi.c       Thu Aug 22 20:00:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.154 2013/07/11 19:46:44 aymeric Exp $      */
+/*     $NetBSD: usbdi.c,v 1.155 2013/08/22 20:00:43 aymeric Exp $      */
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.154 2013/07/11 19:46:44 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.155 2013/08/22 20:00:43 aymeric Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -337,7 +337,8 @@
                                err = tsleep(xfer, PRIBIO, "usbsyn", 0);
                }
                if (err) {
-                       pipe->methods->abort(xfer);
+                       if (!xfer->done)
+                               pipe->methods->abort(xfer);
                        break;
                }
        }