aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-ps3.c
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2007-04-30 17:01:01 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-02 06:04:31 -0400
commitdc4f60c25ae71e8278dcf909486e4aa34de7eecb (patch)
treeb6715d447588d05038cc1f655874df513d312f86 /drivers/usb/host/ehci-ps3.c
parent12828856630e616742e092c8ccbda6ebc56a9375 (diff)
[POWERPC] PS3: Interrupt routine fixups.
Fixups for the ps3 interrupt routines to support all HV device in a generic way. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/usb/host/ehci-ps3.c')
-rw-r--r--drivers/usb/host/ehci-ps3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 4d781a2a9807..29dcd27b55de 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -104,7 +104,7 @@ static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
104 dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__, 104 dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
105 __LINE__, dev->m_region->lpar_addr); 105 __LINE__, dev->m_region->lpar_addr);
106 106
107 result = ps3_alloc_io_irq(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq); 107 result = ps3_io_irq_setup(PS3_BINDING_CPU_ANY, dev->interrupt_id, &virq);
108 108
109 if (result) { 109 if (result) {
110 dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n", 110 dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
@@ -162,7 +162,7 @@ fail_add_hcd:
162fail_ioremap: 162fail_ioremap:
163 usb_put_hcd(hcd); 163 usb_put_hcd(hcd);
164fail_create_hcd: 164fail_create_hcd:
165 ps3_free_io_irq(virq); 165 ps3_io_irq_destroy(virq);
166fail_irq: 166fail_irq:
167 ps3_free_mmio_region(dev->m_region); 167 ps3_free_mmio_region(dev->m_region);
168fail_mmio: 168fail_mmio: