diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-12-19 05:17:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-19 17:27:30 -0500 |
commit | fcbe6e9709f90fd83cfa614a4e0efe83174018ea (patch) | |
tree | 722a9562abdd1675aa87e12adbb7d4ec8db9c988 /drivers/video | |
parent | 9ac67a35827ee03d71f2f1c656a725e263b14a7e (diff) |
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 614586557cd4..b3128903d673 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c | |||
@@ -1212,7 +1212,7 @@ err_fb_dealloc: | |||
1212 | err_framebuffer_release: | 1212 | err_framebuffer_release: |
1213 | framebuffer_release(info); | 1213 | framebuffer_release(info); |
1214 | err_free_irq: | 1214 | err_free_irq: |
1215 | free_irq(ps3fb.irq_no, dev); | 1215 | free_irq(ps3fb.irq_no, &dev->core); |
1216 | ps3_irq_plug_destroy(ps3fb.irq_no); | 1216 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1217 | err_iounmap_dinfo: | 1217 | err_iounmap_dinfo: |
1218 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1218 | iounmap((u8 __iomem *)ps3fb.dinfo); |
@@ -1247,7 +1247,7 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev) | |||
1247 | kthread_stop(task); | 1247 | kthread_stop(task); |
1248 | } | 1248 | } |
1249 | if (ps3fb.irq_no) { | 1249 | if (ps3fb.irq_no) { |
1250 | free_irq(ps3fb.irq_no, dev); | 1250 | free_irq(ps3fb.irq_no, &dev->core); |
1251 | ps3_irq_plug_destroy(ps3fb.irq_no); | 1251 | ps3_irq_plug_destroy(ps3fb.irq_no); |
1252 | } | 1252 | } |
1253 | iounmap((u8 __iomem *)ps3fb.dinfo); | 1253 | iounmap((u8 __iomem *)ps3fb.dinfo); |