lkml.org 
[lkml]   [2011]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[60/89] xhci: Add defines for hardcoded slot states
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Maarten Lankhorst <m.b.lankhorst@gmail.com>

    commit e2b0217715c6d10379d94bdfe5560af96eecbb7c upstream.

    This needs to be added to the stable trees back to 2.6.34 to support an
    upcoming bug fix.

    Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/host/xhci-dbg.c | 8 ++++----
    drivers/usb/host/xhci.h | 5 +++++
    2 files changed, 9 insertions(+), 4 deletions(-)

    --- a/drivers/usb/host/xhci-dbg.c
    +++ b/drivers/usb/host/xhci-dbg.c
    @@ -437,13 +437,13 @@ char *xhci_get_slot_state(struct xhci_hc
    struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx);

    switch (GET_SLOT_STATE(slot_ctx->dev_state)) {
    - case 0:
    + case SLOT_STATE_ENABLED:
    return "enabled/disabled";
    - case 1:
    + case SLOT_STATE_DEFAULT:
    return "default";
    - case 2:
    + case SLOT_STATE_ADDRESSED:
    return "addressed";
    - case 3:
    + case SLOT_STATE_CONFIGURED:
    return "configured";
    default:
    return "reserved";
    --- a/drivers/usb/host/xhci.h
    +++ b/drivers/usb/host/xhci.h
    @@ -560,6 +560,11 @@ struct xhci_slot_ctx {
    #define SLOT_STATE (0x1f << 27)
    #define GET_SLOT_STATE(p) (((p) & (0x1f << 27)) >> 27)

    +#define SLOT_STATE_DISABLED 0
    +#define SLOT_STATE_ENABLED SLOT_STATE_DISABLED
    +#define SLOT_STATE_DEFAULT 1
    +#define SLOT_STATE_ADDRESSED 2
    +#define SLOT_STATE_CONFIGURED 3

    /**
    * struct xhci_ep_ctx



    \
     
     \ /
      Last update: 2011-06-16 09:37    [W:0.022 / U:0.756 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site