Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 9 Dec 2009 22:40:02 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-usb@FreeBSD.org
Subject:   Re: usb/140242: commit references a PR
Message-ID:  <200912092240.nB9Me2Za099414@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The following reply was made to PR usb/140242; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: usb/140242: commit references a PR
Date: Wed,  9 Dec 2009 22:33:41 +0000 (UTC)

 Author: thompsa
 Date: Wed Dec  9 22:33:22 2009
 New Revision: 200324
 URL: http://svn.freebsd.org/changeset/base/200324
 
 Log:
   MFC r199057
   
    ehci_init() will do reset and set the usbrev flag.  Fix problem where
    ehci_reset() was called before ehci_init().
   
   PR:		usb/140242
   Submitted by:	Sebastian Huber
 
 Modified:
   stable/8/sys/dev/usb/controller/ehci_ixp4xx.c
   stable/8/sys/dev/usb/controller/ehci_mbus.c
   stable/8/sys/dev/usb/controller/ehci_pci.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/xen/xenpci/   (props changed)
 
 Modified: stable/8/sys/dev/usb/controller/ehci_ixp4xx.c
 ==============================================================================
 --- stable/8/sys/dev/usb/controller/ehci_ixp4xx.c	Wed Dec  9 22:32:36 2009	(r200323)
 +++ stable/8/sys/dev/usb/controller/ehci_ixp4xx.c	Wed Dec  9 22:33:22 2009	(r200324)
 @@ -157,8 +157,6 @@ ehci_ixp_attach(device_t self)
  		return (ENOMEM);
  	}
  
 -	sc->sc_bus.usbrev = USB_REV_2_0;
 -
  	/* NB: hints fix the memory location and irq */
  
  	rid = 0;
 @@ -230,7 +228,6 @@ ehci_ixp_attach(device_t self)
  		     | EHCI_SCFLG_BIGEMMIO
  		     | EHCI_SCFLG_NORESTERM
  		     ;
 -	(void) ehci_reset(sc);
  
  	err = ehci_init(sc);
  	if (!err) {
 
 Modified: stable/8/sys/dev/usb/controller/ehci_mbus.c
 ==============================================================================
 --- stable/8/sys/dev/usb/controller/ehci_mbus.c	Wed Dec  9 22:32:36 2009	(r200323)
 +++ stable/8/sys/dev/usb/controller/ehci_mbus.c	Wed Dec  9 22:33:22 2009	(r200324)
 @@ -166,8 +166,6 @@ ehci_mbus_attach(device_t self)
  		return (ENOMEM);
  	}
  
 -	sc->sc_bus.usbrev = USB_REV_2_0;
 -
  	rid = 0;
  	sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
  	if (!sc->sc_io_res) {
 
 Modified: stable/8/sys/dev/usb/controller/ehci_pci.c
 ==============================================================================
 --- stable/8/sys/dev/usb/controller/ehci_pci.c	Wed Dec  9 22:32:36 2009	(r200323)
 +++ stable/8/sys/dev/usb/controller/ehci_pci.c	Wed Dec  9 22:33:22 2009	(r200324)
 @@ -318,13 +318,11 @@ ehci_pci_attach(device_t self)
  		device_printf(self, "pre-2.0 USB revision (ignored)\n");
  		/* fallthrough */
  	case PCI_USB_REV_2_0:
 -		sc->sc_bus.usbrev = USB_REV_2_0;
  		break;
  	default:
  		/* Quirk for Parallels Desktop 4.0 */
  		device_printf(self, "USB revision is unknown. Assuming v2.0.\n");
 -		sc->sc_bus.usbrev = USB_REV_2_0;
 -                break;
 +		break;
  	}
  
  	rid = PCI_CBMEM;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912092240.nB9Me2Za099414>