Skip to content

Commit

Permalink
ps3fb: Fix ps3fb free_irq() dev_id
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geoff Levand authored and Linus Torvalds committed Dec 19, 2007
1 parent 9ac67a3 commit fcbe6e9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/video/ps3fb.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit fcbe6e9

Please sign in to comment.