From: Greg Kroah-Hartman Date: Thu, 20 Oct 2016 13:28:46 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.7.10~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79725b033e51d9afd7481fffb9b931964aa0e549;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch --- diff --git a/queue-4.4/serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch b/queue-4.4/serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch new file mode 100644 index 00000000000..0548bc600c3 --- /dev/null +++ b/queue-4.4/serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch @@ -0,0 +1,31 @@ +From e16b46f190a22587898b331f9d58583b0b166c9a Mon Sep 17 00:00:00 2001 +From: Kefeng Wang +Date: Wed, 24 Aug 2016 16:33:33 +0800 +Subject: serial: 8250_dw: Check the data->pclk when get apb_pclk + +From: Kefeng Wang + +commit e16b46f190a22587898b331f9d58583b0b166c9a upstream. + +It should check the data->pclk, not data->clk when get apb_pclk. + +Fixes: c8ed99d4f6a8("serial: 8250_dw: Add support for deferred probing") +Signed-off-by: Kefeng Wang +Tested-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/serial/8250/8250_dw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/tty/serial/8250/8250_dw.c ++++ b/drivers/tty/serial/8250/8250_dw.c +@@ -440,7 +440,7 @@ static int dw8250_probe(struct platform_ + } + + data->pclk = devm_clk_get(&pdev->dev, "apb_pclk"); +- if (IS_ERR(data->clk) && PTR_ERR(data->clk) == -EPROBE_DEFER) { ++ if (IS_ERR(data->pclk) && PTR_ERR(data->pclk) == -EPROBE_DEFER) { + err = -EPROBE_DEFER; + goto err_clk; + } diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..e8a4bb3c6a5 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1 @@ +serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch diff --git a/queue-4.7/series b/queue-4.7/series new file mode 100644 index 00000000000..a64c1f40645 --- /dev/null +++ b/queue-4.7/series @@ -0,0 +1,9 @@ +serial-imx-fix-dcd-reading.patch +serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch +serial-8250_port-fix-runtime-pm-use-in-__do_stop_tx_rs485.patch +arcv2-intc-use-kflag-if-status32.ie-must-be-reset.patch +arcv2-fix-local_save_flags.patch +debugfs-introduce-a-public-file_operations-accessor.patch +b43-fix-debugfs-crash.patch +b43legacy-fix-debugfs-crash.patch +carl9170-fix-debugfs-crashes.patch diff --git a/queue-4.8/series b/queue-4.8/series new file mode 100644 index 00000000000..2a94c86bfa2 --- /dev/null +++ b/queue-4.8/series @@ -0,0 +1,10 @@ +serial-imx-fix-dcd-reading.patch +bug-atmel_serial-interrupts-not-disabled-on-close.patch +serial-8250_dw-check-the-data-pclk-when-get-apb_pclk.patch +serial-8250_port-fix-runtime-pm-use-in-__do_stop_tx_rs485.patch +arcv2-intc-use-kflag-if-status32.ie-must-be-reset.patch +arcv2-fix-local_save_flags.patch +debugfs-introduce-a-public-file_operations-accessor.patch +b43-fix-debugfs-crash.patch +b43legacy-fix-debugfs-crash.patch +carl9170-fix-debugfs-crashes.patch