Applied to for-usb-next-queue for 3.14.
Sarah Sharp
On Mon, Aug 26, 2013 at 11:29:47PM +0300, Xenia Ragiadakou wrote:
> SCT_FOR_CTX(p) is defined as (((p) << 1) & 0x7) in which case if we want
> to set the stream context type to SCT_SSA_256 i.e 0x7 (although secondary
> stream arrays are not yet supported) using this macro definition we will
> get actually 0x6 which is not what we want.
>
> This patch fixes the above issue by defining the SCT_FOR_CTX(p) macro as
> (((p) & 0x7) << 1)
>
> Signed-off-by: Xenia Ragiadakou <burzalodowa@xxxxxxxxx>
> ---
> drivers/usb/host/xhci.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> index 46aa148..9575088 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -751,7 +751,7 @@ struct xhci_stream_ctx {
> };
>
> /* Stream Context Types (section 6.4.1) - bits 3:1 of stream ctx deq ptr */
> -#define SCT_FOR_CTX(p) (((p) << 1) & 0x7)
> +#define SCT_FOR_CTX(p) (((p) & 0x7) << 1)
> /* Secondary stream array type, dequeue pointer is to a transfer ring */
> #define SCT_SEC_TR 0
> /* Primary stream array type, dequeue pointer is to a transfer ring */
> --
> 1.8.3.4
>
> --
> 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
--
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
