Commit 09d3c1df authored by Paul Mackerras's avatar Paul Mackerras

[PATCH] USB OHCI powerbook fix (v2.5.4)

The patch below fixes a compile problem in the USB OHCI HCD driver on
powerbooks, namely that the ohci_hcd structure doesn't have an irq
member.

Paul.
parent 7994321a
...@@ -662,7 +662,7 @@ static int ohci_suspend (struct usb_hcd *hcd, u32 state) ...@@ -662,7 +662,7 @@ static int ohci_suspend (struct usb_hcd *hcd, u32 state)
#ifdef CONFIG_PMAC_PBOOK #ifdef CONFIG_PMAC_PBOOK
if (_machine == _MACH_Pmac) if (_machine == _MACH_Pmac)
disable_irq (ohci->irq); disable_irq (hcd->pdev->irq);
/* else, 2.4 assumes shared irqs -- don't disable */ /* else, 2.4 assumes shared irqs -- don't disable */
#endif #endif
...@@ -836,7 +836,7 @@ static int ohci_resume (struct usb_hcd *hcd) ...@@ -836,7 +836,7 @@ static int ohci_resume (struct usb_hcd *hcd)
#ifdef CONFIG_PMAC_PBOOK #ifdef CONFIG_PMAC_PBOOK
if (_machine == _MACH_Pmac) if (_machine == _MACH_Pmac)
enable_irq (ohci->irq); enable_irq (hcd->pdev->irq);
#endif #endif
if (ohci->hcca->done_head) if (ohci->hcca->done_head)
dl_done_list (ohci, dl_reverse_done_list (ohci)); dl_done_list (ohci, dl_reverse_done_list (ohci));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment