xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-next' into for-linus

Browse Source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina
2009-12-07 18:36:35 +01:00
parent 6ec22f9b03 6070d81eb5
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/host/ehci-hcd.c
View File

@@ -210,7 +210,7 @@ static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
if (error) {
ehci_halt(ehci);
ehci_to_hcd(ehci)->state = HC_STATE_HALT;
ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n",
ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n",
ptr, mask, done, error);
}

2
drivers/usb/host/fhci-sched.c
View File

@@ -627,7 +627,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd)
/*
* Process normal completions(error or sucess) and clean the schedule.
* Process normal completions(error or success) and clean the schedule.
*
* This is the main path for handing urbs back to drivers. The only other patth
* is process_del_list(),which unlinks URBs by scanning EDs,instead of scanning