Module Name: src Committed By: skrll Date: Fri Oct 7 10:32:49 UTC 2016
Modified Files: src/sys/dev/usb [nick-nhusb]: usb_subr.c Log Message: Make the code match the comment wrt port powered status To generate a diff of this commit: cvs rdiff -u -r1.198.2.31 -r1.198.2.32 src/sys/dev/usb/usb_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usb_subr.c diff -u src/sys/dev/usb/usb_subr.c:1.198.2.31 src/sys/dev/usb/usb_subr.c:1.198.2.32 --- src/sys/dev/usb/usb_subr.c:1.198.2.31 Wed Oct 5 20:55:57 2016 +++ src/sys/dev/usb/usb_subr.c Fri Oct 7 10:32:49 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.198.2.31 2016/10/05 20:55:57 skrll Exp $ */ +/* $NetBSD: usb_subr.c,v 1.198.2.32 2016/10/07 10:32:49 skrll Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.31 2016/10/05 20:55:57 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.32 2016/10/07 10:32:49 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1563,10 +1563,9 @@ usbd_fill_deviceinfo(struct usbd_device * on 3.x, and UPS_PORT_POWER is available * only on 2.0 or 1.1. */ - else if (USB_IS_SS(dev->ud_speed) && - (s & UPS_PORT_POWER_SS)) + else if (sshub_p && (s & UPS_PORT_POWER_SS)) err = USB_PORT_POWERED; - else if (s & UPS_PORT_POWER) + else if (!sshub_p && (s & UPS_PORT_POWER)) err = USB_PORT_POWERED; else err = USB_PORT_DISABLED;