diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-19 15:28:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-21 17:07:27 +0200 |
| commit | 3cde552980e99d537ff88352202932f8c0bc12e4 (patch) | |
| tree | 09cc08c6c01016cac5d4ff563eb0a19a836ac058 | |
| parent | e524bfab417cb2c109eb9b8e900f98a944dbf494 (diff) | |
Revert "tty: goldfish: Fix a parameter of a call to free_irq"
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
| -rw-r--r-- | drivers/tty/goldfish.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index beb3142a1414..09495f515fa9 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -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) |