diff --git a/[refs] b/[refs] index caf36a6bda9f..a6d1dae6eb68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ac67a35827ee03d71f2f1c656a725e263b14a7e +refs/heads/master: fcbe6e9709f90fd83cfa614a4e0efe83174018ea diff --git a/trunk/drivers/video/ps3fb.c b/trunk/drivers/video/ps3fb.c index 614586557cd4..b3128903d673 100644 --- a/trunk/drivers/video/ps3fb.c +++ b/trunk/drivers/video/ps3fb.c @@ -1212,7 +1212,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) err_framebuffer_release: framebuffer_release(info); err_free_irq: - free_irq(ps3fb.irq_no, dev); + free_irq(ps3fb.irq_no, &dev->core); ps3_irq_plug_destroy(ps3fb.irq_no); err_iounmap_dinfo: iounmap((u8 __iomem *)ps3fb.dinfo); @@ -1247,7 +1247,7 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev) kthread_stop(task); } if (ps3fb.irq_no) { - free_irq(ps3fb.irq_no, dev); + free_irq(ps3fb.irq_no, &dev->core); ps3_irq_plug_destroy(ps3fb.irq_no); } iounmap((u8 __iomem *)ps3fb.dinfo);