On Mon, 17 Aug 2015, Peter Chen wrote:
> The ehci platform device's drvdata is the pointer of struct usb_hcd
> already, so we doesn't need to call bus_to_hcd conversion again.
>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Peter Chen <peter.chen@xxxxxxxxxxxxx>
> ---
> drivers/usb/host/ehci-sysfs.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
> index 5e44407..5216f2b 100644
> --- a/drivers/usb/host/ehci-sysfs.c
> +++ b/drivers/usb/host/ehci-sysfs.c
> @@ -29,7 +29,7 @@ static ssize_t show_companion(struct device *dev,
> int count = PAGE_SIZE;
> char *ptr = buf;
>
> - ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
> + ehci = hcd_to_ehci(dev_get_drvdata(dev));
> nports = HCS_N_PORTS(ehci->hcs_params);
>
> for (index = 0; index < nports; ++index) {
> @@ -54,7 +54,7 @@ static ssize_t store_companion(struct device *dev,
> struct ehci_hcd *ehci;
> int portnum, new_owner;
>
> - ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
> + ehci = hcd_to_ehci(dev_get_drvdata(dev));
> new_owner = PORT_OWNER; /* Owned by companion */
> if (sscanf(buf, "%d", &portnum) != 1)
> return -EINVAL;
> @@ -85,7 +85,7 @@ static ssize_t show_uframe_periodic_max(struct device *dev,
> struct ehci_hcd *ehci;
> int n;
>
> - ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
> + ehci = hcd_to_ehci(dev_get_drvdata(dev));
> n = scnprintf(buf, PAGE_SIZE, "%d\n", ehci->uframe_periodic_max);
> return n;
> }
> @@ -101,7 +101,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
> unsigned long flags;
> ssize_t ret;
>
> - ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
> + ehci = hcd_to_ehci(dev_get_drvdata(dev));
> if (kstrtouint(buf, 0, &uframe_periodic_max) < 0)
> return -EINVAL;
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
This does indeed look like a strange mistake. It worked only because
the embedded usb_bus structure lies at the start of the usb_hcd
structure.
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html