From: Greg Kroah-Hartman Date: Mon, 31 May 2021 11:26:10 +0000 (+0200) Subject: drop some umn.edu patches from 4.4 that should never have been added X-Git-Tag: v4.4.271~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48231ee872b821537d5750c4ef42acf305fde959;p=thirdparty%2Fkernel%2Fstable-queue.git drop some umn.edu patches from 4.4 that should never have been added --- diff --git a/queue-4.4/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch b/queue-4.4/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch deleted file mode 100644 index 2441b95f0d9..00000000000 --- a/queue-4.4/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 07a01d788f4652fd15bbe7d1b14aebda9935b38a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:10 +0200 -Subject: ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd() - -From: Anirudh Rayabharam - -[ Upstream commit fc6a6521556c8250e356ddc6a3f2391aa62dc976 ] - -ath6kl_wmi_cmd_send could fail, so let's return its error code upstream. - -Signed-off-by: Kangjie Lu -Signed-off-by: Kalle Valo -Signed-off-by: Sasha Levin ---- - drivers/net/wireless/ath/ath6kl/debug.c | 5 ++++- - drivers/net/wireless/ath/ath6kl/wmi.c | 4 +--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c -index e2b7809d7886..f3a786af7ece 100644 ---- a/drivers/net/wireless/ath/ath6kl/debug.c -+++ b/drivers/net/wireless/ath/ath6kl/debug.c -@@ -1027,14 +1027,17 @@ static ssize_t ath6kl_lrssi_roam_write(struct file *file, - { - struct ath6kl *ar = file->private_data; - unsigned long lrssi_roam_threshold; -+ int ret; - - if (kstrtoul_from_user(user_buf, count, 0, &lrssi_roam_threshold)) - return -EINVAL; - - ar->lrssi_roam_threshold = lrssi_roam_threshold; - -- ath6kl_wmi_set_roam_lrssi_cmd(ar->wmi, ar->lrssi_roam_threshold); -+ ret = ath6kl_wmi_set_roam_lrssi_cmd(ar->wmi, ar->lrssi_roam_threshold); - -+ if (ret) -+ return ret; - return count; - } - -diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c -index 7e1010475cfb..4aead53acf38 100644 ---- a/drivers/net/wireless/ath/ath6kl/wmi.c -+++ b/drivers/net/wireless/ath/ath6kl/wmi.c -@@ -776,10 +776,8 @@ int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi) - cmd->info.params.roam_rssi_floor = DEF_LRSSI_ROAM_FLOOR; - cmd->roam_ctrl = WMI_SET_LRSSI_SCAN_PARAMS; - -- ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID, -+ return ath6kl_wmi_cmd_send(wmi, 0, skb, WMI_SET_ROAM_CTRL_CMDID, - NO_SYNC_WMIFLAG); -- -- return 0; - } - - int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid) --- -2.30.2 - diff --git a/queue-4.4/media-gspca-mt9m111-check-write_bridge-for-timeout.patch b/queue-4.4/media-gspca-mt9m111-check-write_bridge-for-timeout.patch deleted file mode 100644 index 20a6a617315..00000000000 --- a/queue-4.4/media-gspca-mt9m111-check-write_bridge-for-timeout.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2e88e9fb46605400a624ba9e4a65982d5b0e861d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:28 +0200 -Subject: media: gspca: mt9m111: Check write_bridge for timeout - -From: Alaa Emad - -[ Upstream commit 656025850074f5c1ba2e05be37bda57ba2b8d491 ] - -In mt9m111_probe, m5602_write_bridge can timeout and return a negative -error value. The fix checks for this error and passes it upstream. - -Signed-off-by: Aditya Pakki -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -index 27fcef11aef4..67bb207f4eb2 100644 ---- a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -+++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -@@ -55,7 +55,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = { - int mt9m111_probe(struct sd *sd) - { - u8 data[2] = {0x00, 0x00}; -- int i; -+ int i, err; - struct gspca_dev *gspca_dev = (struct gspca_dev *)sd; - - if (force_sensor) { -@@ -73,15 +73,17 @@ int mt9m111_probe(struct sd *sd) - /* Do the preinit */ - for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) { - if (preinit_mt9m111[i][0] == BRIDGE) { -- m5602_write_bridge(sd, -- preinit_mt9m111[i][1], -- preinit_mt9m111[i][2]); -+ err = m5602_write_bridge(sd, -+ preinit_mt9m111[i][1], -+ preinit_mt9m111[i][2]); - } else { - data[0] = preinit_mt9m111[i][2]; - data[1] = preinit_mt9m111[i][3]; -- m5602_write_sensor(sd, -- preinit_mt9m111[i][1], data, 2); -+ err = m5602_write_sensor(sd, -+ preinit_mt9m111[i][1], data, 2); - } -+ if (err < 0) -+ return err; - } - - if (m5602_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2)) --- -2.30.2 - diff --git a/queue-4.4/series b/queue-4.4/series index 1cfd7f5792f..d7f6702fc57 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -34,10 +34,8 @@ net-caif-remove-bug_on-dev-null-in-caif_xmit.patch char-hpet-add-checks-after-calling-ioremap.patch alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch isdn-misdninfineon-check-cleanup-ioremap-failure-cor.patch -ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch libertas-register-sysfs-groups-properly.patch media-dvb-add-check-on-sp8870_readreg-return.patch -media-gspca-mt9m111-check-write_bridge-for-timeout.patch media-gspca-properly-check-for-errors-in-po1030_prob.patch scsi-buslogic-fix-64-bit-system-enumeration-error-fo.patch openrisc-define-memory-barrier-mb.patch