summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-01-09 01:26:37 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2018-02-05 08:58:32 -0800
commit872946b047f1146c220956bd8457eb90d4b241e9 (patch)
treeee23183d684c02c805959b8ed5c9fbe4961544e0
parent5381edf8435d65b85e774ed2e681bd4b812ff2c8 (diff)
UPSTREAM: tty: goldfish: Fix a parameter of a call to free_irq
'request_irq()' and 'free_irq()' should be called with the same dev_id. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 1a5c2d1de7d35f5eb9793266237903348989502b) Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r--drivers/tty/goldfish.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index 1e332855b933..b2f830d6a654 100644
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -300,7 +300,7 @@ static int goldfish_tty_probe(struct platform_device *pdev)
return 0;
err_tty_register_device_failed:
- free_irq(irq, pdev);
+ free_irq(irq, qtty);
err_request_irq_failed:
goldfish_tty_current_line_count--;
if (goldfish_tty_current_line_count == 0)