4.9-stable patches

added patches:
	asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch
	media-tvp5150-fix-switch-exit-in-set-control-handler.patch

diff --git a/queue-4.9/asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch b/queue-4.9/asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch
new file mode 100644 (file)
index 0000000..3e02de1
--- /dev/null
+++ b/queue-4.9/asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch
@@ -0,0 +1,47 @@
+From 2757970f6d0d0a112247600b23d38c0c728ceeb3 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 19 Feb 2019 16:46:47 +0100
+Subject: ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt()
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 2757970f6d0d0a112247600b23d38c0c728ceeb3 upstream.
+
+The node obtained from of_find_node_by_path() has to be unreferenced
+after the use, but we forgot it for the root node.
+
+Fixes: f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support")
+Cc: Timur Tabi <timur@kernel.org>
+Cc: Nicolin Chen <nicoleotsuka@gmail.com>
+Cc: Xiubo Li <Xiubo.Lee@gmail.com>
+Cc: Fabio Estevam <festevam@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/fsl/fsl_ssi.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/sound/soc/fsl/fsl_ssi.c
++++ b/sound/soc/fsl/fsl_ssi.c
+@@ -1431,6 +1431,7 @@ static int fsl_ssi_probe(struct platform
+       struct fsl_ssi_private *ssi_private;
+       int ret = 0;
+       struct device_node *np = pdev->dev.of_node;
++      struct device_node *root;
+       const struct of_device_id *of_id;
+       const char *p, *sprop;
+       const uint32_t *iprop;
+@@ -1620,7 +1621,9 @@ static int fsl_ssi_probe(struct platform
+        * device tree.  We also pass the address of the CPU DAI driver
+        * structure.
+        */
+-      sprop = of_get_property(of_find_node_by_path("/"), "compatible", NULL);
++      root = of_find_node_by_path("/");
++      sprop = of_get_property(root, "compatible", NULL);
++      of_node_put(root);
+       /* Sometimes the compatible name has a "fsl," prefix, so we strip it. */
+       p = strrchr(sprop, ',');
+       if (p)

diff --git a/queue-4.9/media-tvp5150-fix-switch-exit-in-set-control-handler.patch b/queue-4.9/media-tvp5150-fix-switch-exit-in-set-control-handler.patch
new file mode 100644 (file)
index 0000000..9ed2280
--- /dev/null
+++ b/queue-4.9/media-tvp5150-fix-switch-exit-in-set-control-handler.patch
@@ -0,0 +1,39 @@
+From 2d29bcc8c237874795175b2930fa9a45a115175a Mon Sep 17 00:00:00 2001
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Thu, 28 Jun 2018 12:20:34 -0400
+Subject: media: tvp5150: fix switch exit in set control handler
+
+From: Marco Felsch <m.felsch@pengutronix.de>
+
+commit 2d29bcc8c237874795175b2930fa9a45a115175a upstream.
+
+The function only consists of a single switch case block without a
+default case. Unsupported control requests are indicated by the -EINVAL
+return code trough the last return statement at the end of the function. So
+exiting just the switch case block returns the -EINVAL error code but the
+hue control is supported and a zero should be returned instead.
+
+Replace the break by a 'return 0' to fix this behaviour.
+
+Fixes: d183e4efcae8 ("[media] v4l: tvp5150: Add missing break in set
+control handler")
+
+Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/i2c/tvp5150.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/i2c/tvp5150.c
++++ b/drivers/media/i2c/tvp5150.c
+@@ -824,7 +824,7 @@ static int tvp5150_s_ctrl(struct v4l2_ct
+               return 0;
+       case V4L2_CID_HUE:
+               tvp5150_write(sd, TVP5150_HUE_CTL, ctrl->val);
+-              break;
++              return 0;
+       case V4L2_CID_TEST_PATTERN:
+               decoder->enable = ctrl->val ? false : true;
+               tvp5150_selmux(sd);

diff --git a/queue-4.9/series b/queue-4.9/series
index 825e93bf76e2375ace5e090bceee9f39dd7f90f3..5c4e3e374ac8b5eb7826747434c190c9d025b8e8 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -5,3 +5,5 @@ hid-logitech-fix-general-protection-fault-caused-by-logitech-driver.patch
 hid-hidraw-fix-invalid-read-in-hidraw_ioctl.patch
 mtd-cfi_cmdset_0002-use-chip_good-to-retry-in-do_write_oneword.patch
 crypto-talitos-fix-missing-break-in-switch-statement.patch
+media-tvp5150-fix-switch-exit-in-set-control-handler.patch
+asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch