From: Greg Kroah-Hartman Date: Thu, 19 Oct 2017 13:38:52 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v3.18.77~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12a2d548b86419d5382717578fa45fe7b5e4d238;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: revert-tty-goldfish-fix-a-parameter-of-a-call-to-free_irq.patch --- diff --git a/queue-3.18/revert-tty-goldfish-fix-a-parameter-of-a-call-to-free_irq.patch b/queue-3.18/revert-tty-goldfish-fix-a-parameter-of-a-call-to-free_irq.patch new file mode 100644 index 00000000000..abd88348f12 --- /dev/null +++ b/queue-3.18/revert-tty-goldfish-fix-a-parameter-of-a-call-to-free_irq.patch @@ -0,0 +1,36 @@ +From 037c9ebf920ab339593aaf240135c15d66854dc1 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 19 Oct 2017 15:28:08 +0200 +Subject: [PATCH] Revert "tty: goldfish: Fix a parameter of a call to free_irq" + +From: Greg Kroah-Hartman + +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 +Cc: Christophe JAILLET +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org +--- + drivers/tty/goldfish.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/tty/goldfish.c ++++ b/drivers/tty/goldfish.c +@@ -295,7 +295,7 @@ static int goldfish_tty_probe(struct pla + + 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) diff --git a/queue-3.18/series b/queue-3.18/series index 5a03c0f2d49..59a4126389b 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -24,3 +24,4 @@ scsi-scsi_dh_emc-return-success-in-clariion_std_inquiry.patch uapi-fix-linux-rds.h-userspace-compilation-errors.patch uapi-fix-linux-mroute6.h-userspace-compilation-errors.patch target-iscsi-fix-unsolicited-data-seq_end_offset-calculation.patch +revert-tty-goldfish-fix-a-parameter-of-a-call-to-free_irq.patch