git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: ch341: forward USB errors to USB serial core
[pandora-kernel.git]
/
drivers
/
usb
/
early
/
ehci-dbgp.c
diff --git
a/drivers/usb/early/ehci-dbgp.c
b/drivers/usb/early/ehci-dbgp.c
index
a6a350f
..
347bb05
100644
(file)
--- a/
drivers/usb/early/ehci-dbgp.c
+++ b/
drivers/usb/early/ehci-dbgp.c
@@
-102,6
+102,9
@@
static struct kgdb_io kgdbdbgp_io_ops;
#define dbgp_kgdb_mode (0)
#endif
#define dbgp_kgdb_mode (0)
#endif
+/* Local version of HC_LENGTH macro as ehci struct is not available here */
+#define EARLY_HC_LENGTH(p) (0x00ff & (p)) /* bits 7 : 0 */
+
/*
* USB Packet IDs (PIDs)
*/
/*
* USB Packet IDs (PIDs)
*/
@@
-447,7
+450,7
@@
static int dbgp_ehci_startup(void)
writel(FLAG_CF, &ehci_regs->configured_flag);
/* Wait until the controller is no longer halted */
writel(FLAG_CF, &ehci_regs->configured_flag);
/* Wait until the controller is no longer halted */
- loop = 10;
+ loop = 10
00
;
do {
status = readl(&ehci_regs->status);
if (!(status & STS_HALT))
do {
status = readl(&ehci_regs->status);
if (!(status & STS_HALT))
@@
-892,7
+895,7
@@
int __init early_dbgp_init(char *s)
dbgp_printk("ehci_bar: %p\n", ehci_bar);
ehci_caps = ehci_bar;
dbgp_printk("ehci_bar: %p\n", ehci_bar);
ehci_caps = ehci_bar;
- ehci_regs = ehci_bar + HC_LENGTH(readl(&ehci_caps->hc_capbase));
+ ehci_regs = ehci_bar +
EARLY_
HC_LENGTH(readl(&ehci_caps->hc_capbase));
ehci_debug = ehci_bar + offset;
ehci_dev.bus = bus;
ehci_dev.slot = slot;
ehci_debug = ehci_bar + offset;
ehci_dev.bus = bus;
ehci_dev.slot = slot;