diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 13:32:41 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 13:32:41 +0200 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/usb/early/ehci-dbgp.c | |
| parent | TOMOYO: Fix infinite loop bug when reading /sys/kernel/security/tomoyo/audit (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| download | linux-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.tar.xz linux-d4ab4e6a23f805abb8fc3cc34525eec3788aeca1.zip | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/usb/early/ehci-dbgp.c')
| -rw-r--r-- | drivers/usb/early/ehci-dbgp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c index 0bc06e2bcfcb..a6a350f5827b 100644 --- a/drivers/usb/early/ehci-dbgp.c +++ b/drivers/usb/early/ehci-dbgp.c @@ -648,7 +648,7 @@ static int ehci_reset_port(int port) if (!(portsc & PORT_CONNECT)) return -ENOTCONN; - /* bomb out completely if something weird happend */ + /* bomb out completely if something weird happened */ if ((portsc & PORT_CSC)) return -EINVAL; |