xhci: fix incorrect type in assignment in xhci_address_device()
authorXenia Ragiadakou <burzalodowa@gmail.com>
Fri, 15 Nov 2013 01:18:07 +0000 (03:18 +0200)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Mon, 2 Dec 2013 20:59:45 +0000 (12:59 -0800)
The field 'dev_info' in struct xhci_slot_ctx has type __le32 and it needs
to be converted to CPU byteorder for the correct retrieval of its subfield
'Context Entries'. This field is used by the trace event 'xhci_address_ctx'
to trace only the contexts of valid endpoints.
This bug was found using sparse.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
drivers/usb/host/xhci.c

index 4265b48856f6a7b0160124964b3b7fc697ecd826..a96b35cf4fa728e573095abf9fb8f2a01a23640d 100644 (file)
@@ -3771,7 +3771,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
        xhci_dbg(xhci, "Slot ID %d Input Context:\n", udev->slot_id);
        xhci_dbg_ctx(xhci, virt_dev->in_ctx, 2);
        trace_xhci_address_ctx(xhci, virt_dev->in_ctx,
-                               slot_ctx->dev_info >> 27);
+                               le32_to_cpu(slot_ctx->dev_info) >> 27);
 
        spin_lock_irqsave(&xhci->lock, flags);
        cmd_trb = xhci_find_next_enqueue(xhci->cmd_ring);
@@ -3850,7 +3850,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
        xhci_dbg(xhci, "Slot ID %d Input Context:\n", udev->slot_id);
        xhci_dbg_ctx(xhci, virt_dev->in_ctx, 2);
        trace_xhci_address_ctx(xhci, virt_dev->in_ctx,
-                               slot_ctx->dev_info >> 27);
+                               le32_to_cpu(slot_ctx->dev_info) >> 27);
        xhci_dbg(xhci, "Slot ID %d Output Context:\n", udev->slot_id);
        xhci_dbg_ctx(xhci, virt_dev->out_ctx, 2);
        /*
@@ -3859,7 +3859,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)
         */
        slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->out_ctx);
        trace_xhci_address_ctx(xhci, virt_dev->out_ctx,
-                               slot_ctx->dev_info >> 27);
+                               le32_to_cpu(slot_ctx->dev_info) >> 27);
        /* Zero the input context control for later use */
        ctrl_ctx->add_flags = 0;
        ctrl_ctx->drop_flags = 0;