From: Greg Kroah-Hartman Date: Tue, 24 Sep 2019 20:35:39 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.3.2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fb6c9febe0ea6a6dfec660a91d1b31d8696897b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch iwlwifi-mvm-send-bcast-management-frames-to-the-right-station.patch media-tvp5150-fix-switch-exit-in-set-control-handler.patch --- diff --git a/queue-4.14/asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch b/queue-4.14/asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch new file mode 100644 index 00000000000..199d24ebabd --- /dev/null +++ b/queue-4.14/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 +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 + +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 +Cc: Nicolin Chen +Cc: Xiubo Li +Cc: Fabio Estevam +Signed-off-by: Takashi Iwai +Acked-by: Nicolin Chen +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1418,6 +1418,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; +@@ -1605,7 +1606,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.14/iwlwifi-mvm-send-bcast-management-frames-to-the-right-station.patch b/queue-4.14/iwlwifi-mvm-send-bcast-management-frames-to-the-right-station.patch new file mode 100644 index 00000000000..1dbb1ba37c7 --- /dev/null +++ b/queue-4.14/iwlwifi-mvm-send-bcast-management-frames-to-the-right-station.patch @@ -0,0 +1,36 @@ +From 65c3b582ecab7a403efdf08babbf87fdbe27369c Mon Sep 17 00:00:00 2001 +From: Emmanuel Grumbach +Date: Mon, 7 May 2018 16:46:35 +0300 +Subject: iwlwifi: mvm: send BCAST management frames to the right station + +From: Emmanuel Grumbach + +commit 65c3b582ecab7a403efdf08babbf87fdbe27369c upstream. + +Probe responses were sent to the multicast station while +they should be routed to the broadcast station. +This has no negative effect since the frame was still +routed to the right queue, but it looked very fishy +to send a frame to a (queue, station) tuple where +'queue' is not mapped to 'station'. + +Fixes: 7c305de2b954 ("iwlwifi: mvm: Direct multicast frames to the correct station") +Signed-off-by: Emmanuel Grumbach +Signed-off-by: Luca Coelho +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +@@ -651,7 +651,7 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mv + if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE || + info.control.vif->type == NL80211_IFTYPE_AP || + info.control.vif->type == NL80211_IFTYPE_ADHOC) { +- if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE) ++ if (!ieee80211_is_data(hdr->frame_control)) + sta_id = mvmvif->bcast_sta.sta_id; + else + sta_id = mvmvif->mcast_sta.sta_id; diff --git a/queue-4.14/media-tvp5150-fix-switch-exit-in-set-control-handler.patch b/queue-4.14/media-tvp5150-fix-switch-exit-in-set-control-handler.patch new file mode 100644 index 00000000000..13ea9245618 --- /dev/null +++ b/queue-4.14/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 +Date: Thu, 28 Jun 2018 12:20:34 -0400 +Subject: media: tvp5150: fix switch exit in set control handler + +From: Marco Felsch + +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 +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -827,7 +827,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.14/series b/queue-4.14/series index ce933c1d68b..d00d579248b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -8,3 +8,6 @@ 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 +iwlwifi-mvm-send-bcast-management-frames-to-the-right-station.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