diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2010-03-04 17:05:08 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:31 -0400 |
commit | 749da5f82fe33ff68dd4aa1a5e35cd9aa6246dab (patch) | |
tree | 2c0a7c689ab6a58f3a799ae51e41ac885e212194 /drivers/usb/musb/musb_virthub.c | |
parent | 288ead45fa6637e959015d055304f521cbbc0575 (diff) |
USB: straighten out port feature vs. port status usage
This patch (as1349b) clears up the confusion in many USB host
controller drivers between port features and port statuses. In mosty
cases it's true that the status bit is in the position given by the
corresponding feature value, but that's not always true and it's not
guaranteed in the USB spec.
There's no functional change, just replacing expressions of the form
(1 << USB_PORT_FEAT_x) with USB_PORT_STAT_x, which has the same value.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_virthub.c')
-rw-r--r-- | drivers/usb/musb/musb_virthub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c index 7775e1c0a21..92e85e027cf 100644 --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c | |||
@@ -183,8 +183,8 @@ static void musb_port_reset(struct musb *musb, bool do_reset) | |||
183 | 183 | ||
184 | void musb_root_disconnect(struct musb *musb) | 184 | void musb_root_disconnect(struct musb *musb) |
185 | { | 185 | { |
186 | musb->port1_status = (1 << USB_PORT_FEAT_POWER) | 186 | musb->port1_status = USB_PORT_STAT_POWER |
187 | | (1 << USB_PORT_FEAT_C_CONNECTION); | 187 | | (USB_PORT_STAT_C_CONNECTION << 16); |
188 | 188 | ||
189 | usb_hcd_poll_rh_status(musb_to_hcd(musb)); | 189 | usb_hcd_poll_rh_status(musb_to_hcd(musb)); |
190 | musb->is_active = 0; | 190 | musb->is_active = 0; |