]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ps3fb: Fix ps3fb free_irq() dev_id
authorGeoff Levand <geoffrey.levand@am.sony.com>
Wed, 19 Dec 2007 10:17:31 +0000 (11:17 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 19 Dec 2007 22:27:30 +0000 (14:27 -0800)
The dev_id arg passed to free_irq() must match that passed to
request_irq().

Fixes this PS3 error message:

  Trying to free already-free IRQ 44

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/ps3fb.c

index 614586557cd46173ae50243bcfdee788cb5bbb9e..b3128903d67328fdcb5747de418e59b177fe2dc0 100644 (file)
@@ -1212,7 +1212,7 @@ err_fb_dealloc:
 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);