diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-12-19 11:17:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-19 14:27:30 -0800 |
| commit | fcbe6e9709f90fd83cfa614a4e0efe83174018ea (patch) | |
| tree | 722a9562abdd1675aa87e12adbb7d4ec8db9c988 /drivers/video | |
| parent | 9ac67a35827ee03d71f2f1c656a725e263b14a7e (diff) | |
| download | op-kernel-dev-fcbe6e9709f90fd83cfa614a4e0efe83174018ea.zip op-kernel-dev-fcbe6e9709f90fd83cfa614a4e0efe83174018ea.tar.gz | |
ps3fb: Fix ps3fb free_irq() dev_id
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/ps3fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 6145865..b312890 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c @@ -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); |
