From ede0faa665b66d95a66ca23ccf29b08ba4d98d2a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Apr 2009 19:12:44 -0700 Subject: [PATCH] --- yaml --- r: 151423 b: refs/heads/master c: 045f123d9c83b9a18c9d43a9afbf52bf0799640d h: refs/heads/master i: 151421: 4f0eb7a19f4d560d7be23e37e129c7ac7f20b204 151419: f9f4959409d663bda3dd6d1c8b8654950f266408 151415: d9e1e76d09892841a15d3ded32cb5647eafdf7d4 151407: 619e49d31825a6c5b177b5c3dac9225b716a606c 151391: 89dd712a79e87c496c48d04c49eca82ccc0b9c1b 151359: 648c969c802571bd696b05af747686e8321be126 151295: 9379522ec0358d98d35d9b66707d8ba8d6019036 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e584310c9325..760ed854d241 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 700e2052c6814b1b1d2714225d568c5c64bc49ae +refs/heads/master: 045f123d9c83b9a18c9d43a9afbf52bf0799640d diff --git a/trunk/drivers/usb/host/xhci.h b/trunk/drivers/usb/host/xhci.h index e57a609e381d..13c9166e758a 100644 --- a/trunk/drivers/usb/host/xhci.h +++ b/trunk/drivers/usb/host/xhci.h @@ -1068,12 +1068,13 @@ static inline unsigned int xhci_readl(const struct xhci_hcd *xhci, { return readl(regs); } -static inline void xhci_writel(const struct xhci_hcd *xhci, +static inline void xhci_writel(struct xhci_hcd *xhci, const unsigned int val, __u32 __iomem *regs) { if (!in_interrupt()) - xhci_dbg(xhci, "`MEM_WRITE_DWORD(3'b000, 32'h%0x, 32'h%0x, 4'hf);\n", - (unsigned int) regs, val); + xhci_dbg(xhci, + "`MEM_WRITE_DWORD(3'b000, 32'h%p, 32'h%0x, 4'hf);\n", + regs, val); writel(val, regs); }