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:09:06 +0200 |
| commit | 401231d063c5b362428b80739896a5ee8513d8c5 (patch) | |
| tree | d4fecb145f1da30c22eaac7370e922a88bbe45b9 | |
| parent | cdbbea7809cabac32ec5dcba1d3d5fbe77ff1180 (diff) | |
Revert "tty: goldfish: Fix a parameter of a call to free_irq"
This reverts commit 01b3db29ba1edd79b9c3e7cd294739b70257d278 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 e04b57f79df8..0f82c0b146f6 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -293,7 +293,7 @@ static int goldfish_tty_probe(struct platform_device *pdev) return 0; 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) |