]> git.hungrycats.org Git - linux/commitdiff
Revert "tty: goldfish: Fix a parameter of a call to free_irq"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Oct 2017 13:28:08 +0000 (15:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Oct 2017 15:07:27 +0000 (17:07 +0200)
This reverts commit 0961072120f3e40fe98c2bb49c45549ca3f042dc which is
commit 1a5c2d1de7d35f5eb9793266237903348989502b upstream.

Ben writes:
This fixes a bug introduced in 4.6 by commit 465893e18878 "tty:
goldfish: support platform_device with id -1".  For earlier
kernel versions, it *introduces* a bug.

So let's drop it.

Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
drivers/tty/goldfish.c

index beb3142a1414a26c8568a9170236c48dc1d17480..09495f515fa97805fb84d8c1362902f6255d0187 100644 (file)
@@ -295,7 +295,7 @@ static int goldfish_tty_probe(struct platform_device *pdev)
 
        tty_unregister_device(goldfish_tty_driver, i);
 err_tty_register_device_failed:
-       free_irq(irq, qtty);
+       free_irq(irq, pdev);
 err_request_irq_failed:
        goldfish_tty_current_line_count--;
        if (goldfish_tty_current_line_count == 0)