Changeset 19073 for src/linux/universal/linux-3.3/drivers/usb/host/xhci.c

Timestamp:

04/20/12 12:40:43 (13 months ago)

Author:

BrainSlayer

Message:

kernel update

File:

• src/linux/universal/linux-3.3/drivers/usb/host/xhci.c (modified) (2 diffs)

src/linux/universal/linux-3.3/drivers/usb/host/xhci.c

@@ -665 +665 @@
         xhci->s3.dcbaa_ptr = xhci_read_64(xhci, &xhci->op_regs->dcbaa_ptr);
         xhci->s3.config_reg = xhci_readl(xhci, &xhci->op_regs->config_reg);
-        xhci->s3.irq_pending = xhci_readl(xhci, &xhci->ir_set->irq_pending);
-        xhci->s3.irq_control = xhci_readl(xhci, &xhci->ir_set->irq_control);
         xhci->s3.erst_size = xhci_readl(xhci, &xhci->ir_set->erst_size);
         xhci->s3.erst_base = xhci_read_64(xhci, &xhci->ir_set->erst_base);
         xhci->s3.erst_dequeue = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue);
+        xhci->s3.irq_pending = xhci_readl(xhci, &xhci->ir_set->irq_pending);
+        xhci->s3.irq_control = xhci_readl(xhci, &xhci->ir_set->irq_control);
 }
 
@@ -678 +678 @@
         xhci_write_64(xhci, xhci->s3.dcbaa_ptr, &xhci->op_regs->dcbaa_ptr);
         xhci_writel(xhci, xhci->s3.config_reg, &xhci->op_regs->config_reg);
+        xhci_writel(xhci, xhci->s3.erst_size, &xhci->ir_set->erst_size);
+        xhci_write_64(xhci, xhci->s3.erst_base, &xhci->ir_set->erst_base);
+        xhci_write_64(xhci, xhci->s3.erst_dequeue, &xhci->ir_set->erst_dequeue);
         xhci_writel(xhci, xhci->s3.irq_pending, &xhci->ir_set->irq_pending);
         xhci_writel(xhci, xhci->s3.irq_control, &xhci->ir_set->irq_control);
-        xhci_writel(xhci, xhci->s3.erst_size, &xhci->ir_set->erst_size);
-        xhci_write_64(xhci, xhci->s3.erst_base, &xhci->ir_set->erst_base);
 }