Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbe6e97 authored by Geoff Levand's avatar Geoff Levand Committed by Linus Torvalds
Browse files

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: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9ac67a35

drivers/video/ps3fb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1212,7 +1212,7 @@ err_fb_dealloc: 
err_framebuffer_release:

err_framebuffer_release:

	framebuffer_release(info);

	framebuffer_release(info);

err_free_irq:

err_free_irq:

	free_irq(ps3fb.irq_no, dev);

	free_irq(ps3fb.irq_no, &dev->core);

	ps3_irq_plug_destroy(ps3fb.irq_no);

	ps3_irq_plug_destroy(ps3fb.irq_no);

err_iounmap_dinfo:

err_iounmap_dinfo:

	iounmap((u8 __iomem *)ps3fb.dinfo);

	iounmap((u8 __iomem *)ps3fb.dinfo);
@@ -1247,7 +1247,7 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev) 
		kthread_stop(task);

		kthread_stop(task);

	}

	}

	if (ps3fb.irq_no) {

	if (ps3fb.irq_no) {

		free_irq(ps3fb.irq_no, dev);

		free_irq(ps3fb.irq_no, &dev->core);

		ps3_irq_plug_destroy(ps3fb.irq_no);

		ps3_irq_plug_destroy(ps3fb.irq_no);

	}

	}

	iounmap((u8 __iomem *)ps3fb.dinfo);

	iounmap((u8 __iomem *)ps3fb.dinfo);