[src/netbsd-6]: src/sys/dev/usb Pull up following revision(s) (requested by s...

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

details:   https://anonhg.NetBSD.org/src/rev/d15a3b345b59
branches:  netbsd-6
changeset: 775605:d15a3b345b59
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Jan 05 23:30:04 2013 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #765):
        sys/dev/usb/ohci.c: revision 1.226
PR/41602
Fix a memory leak when ohci_device_setintr didn't return
USBD_NORMAL_COMPLETION.
ohci_setup_isoc always returns USBD_NORMAL_COMPLETION at the moment so
there's no chance of a leak there.
PR/41602
Fix a memory leak when ohci_device_setintr didn't return
USBD_NORMAL_COMPLETION.
ohci_setup_isoc always returns USBD_NORMAL_COMPLETION at the moment so
there's no chance of a leak there.

diffstat:

 sys/dev/usb/ohci.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 8de319a3c295 -r d15a3b345b59 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sat Jan 05 23:27:33 2013 +0000
+++ b/sys/dev/usb/ohci.c        Sat Jan 05 23:30:04 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.218 2011/08/07 13:45:46 jmcneill Exp $      */
+/*     $NetBSD: ohci.c,v 1.218.8.1 2013/01/05 23:30:04 riz Exp $       */
 /*     $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $       */
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218 2011/08/07 13:45:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.218.8.1 2013/01/05 23:30:04 riz Exp $");
 
 #include "opt_usb.h"
 
@@ -2146,7 +2146,10 @@
                        ival = pipe->interval;
                        if (ival == USBD_DEFAULT_INTERVAL)
                                ival = ed->bInterval;
-                       return (ohci_device_setintr(sc, opipe, ival));
+                       err = ohci_device_setintr(sc, opipe, ival);
+                       if (err)
+                               goto bad;
+                       break;
                case UE_ISOCHRONOUS:
                        pipe->methods = &ohci_device_isoc_methods;
                        return (ohci_setup_isoc(pipe));