* Ben Hutchings <ben@xxxxxxxxxxxxxxx> [150523 20:29]:
> Currently we always assign one of the two common implementations of
> ep_offset and ep_select operations, overwriting any platform-specific
> implementations.
>
> Fixes: d026e9c76aac ("usb: musb: Change end point selection to use ...")
> Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
> ---
> This is untested; I just spotted this while backporting Tony's work on
> multiplatform support.
Good catch, works for me:
Tested-by: Tony Lindgren <tony@xxxxxxxxxxx>
> drivers/usb/musb/musb_core.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 3789b08..6dca3d7 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -2021,13 +2021,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
> if (musb->ops->quirks)
> musb->io.quirks = musb->ops->quirks;
>
> - /* At least tusb6010 has it's own offsets.. */
> - if (musb->ops->ep_offset)
> - musb->io.ep_offset = musb->ops->ep_offset;
> - if (musb->ops->ep_select)
> - musb->io.ep_select = musb->ops->ep_select;
> -
> - /* ..and some devices use indexed offset or flat offset */
> + /* Most devices use indexed offset or flat offset */
> if (musb->io.quirks & MUSB_INDEXED_EP) {
> musb->io.ep_offset = musb_indexed_ep_offset;
> musb->io.ep_select = musb_indexed_ep_select;
> @@ -2036,6 +2030,12 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
> musb->io.ep_select = musb_flat_ep_select;
> }
>
> + /* At least tusb6010 has its own offsets */
> + if (musb->ops->ep_offset)
> + musb->io.ep_offset = musb->ops->ep_offset;
> + if (musb->ops->ep_select)
> + musb->io.ep_select = musb->ops->ep_select;
> +
> if (musb->ops->fifo_mode)
> fifo_mode = musb->ops->fifo_mode;
> else
>
> --
> Ben Hutchings
> Experience is what causes a person to make new mistakes instead of old ones.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
