Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f20dfb4 authored by Yuyang Du's avatar Yuyang Du Committed by Felipe Balbi
Browse files

usb: gadget: dummy_hcd: Fix wrong power status bit clear/reset in dummy_hub_control() 



This fixes the commit: 1cd8fd28 ("usb: gadget: dummy_hcd: add
SuperSpeed support").

In the case of ClearPortFeature and USB_PORT_FEAT_POWER, simply clear
the right bit regardless of what the wValue is.

Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarYuyang Du <yuyang.du@intel.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent a2cfed43

drivers/usb/gadget/udc/dummy_hcd.c

+8 −12
Original line number Diff line number Diff line
@@ -2062,16 +2062,13 @@ static int dummy_hub_control( 
			}

			break;

		case USB_PORT_FEAT_POWER:

			if (hcd->speed == HCD_USB3) {

				if (dum_hcd->port_status & USB_PORT_STAT_POWER)

					dev_dbg(dummy_dev(dum_hcd),

						"power-off\n");

			} else

				if (dum_hcd->port_status &

							USB_SS_PORT_STAT_POWER)

					dev_dbg(dummy_dev(dum_hcd),

						"power-off\n");

			/* FALLS THROUGH */

			dev_dbg(dummy_dev(dum_hcd), "power-off\n");

			if (hcd->speed == HCD_USB3)

				dum_hcd->port_status &= ~USB_SS_PORT_STAT_POWER;

			else

				dum_hcd->port_status &= ~USB_PORT_STAT_POWER;

			set_link_state(dum_hcd);

			break;

		default:

			dum_hcd->port_status &= ~(1 << wValue);

			set_link_state(dum_hcd);
@@ -2242,14 +2239,13 @@ static int dummy_hub_control( 
				if ((dum_hcd->port_status &

				     USB_SS_PORT_STAT_POWER) != 0) {

					dum_hcd->port_status |= (1 << wValue);

					set_link_state(dum_hcd);

				}

			} else

				if ((dum_hcd->port_status &

				     USB_PORT_STAT_POWER) != 0) {

					dum_hcd->port_status |= (1 << wValue);

					set_link_state(dum_hcd);

				}

			set_link_state(dum_hcd);

		}

		break;

	case GetPortErrorCount: