From 47dc80e40cf85317e453dbf343d2f4f5045b4e3a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 31 May 2021 13:33:57 +0200 Subject: [PATCH] drop umn.edu patches from 4.9, 4.19, and 4.14 queues --- ...ror-code-in-ath6kl_wmi_set_roam_lrss.patch | 61 ------------------- ...9m111-check-write_bridge-for-timeout.patch | 58 ------------------ queue-4.14/series | 2 - ...ror-code-in-ath6kl_wmi_set_roam_lrss.patch | 61 ------------------- ...9m111-check-write_bridge-for-timeout.patch | 58 ------------------ queue-4.19/series | 2 - ...ror-code-in-ath6kl_wmi_set_roam_lrss.patch | 61 ------------------- ...9m111-check-write_bridge-for-timeout.patch | 58 ------------------ queue-4.9/series | 2 - 9 files changed, 363 deletions(-) delete mode 100644 queue-4.14/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch delete mode 100644 queue-4.14/media-gspca-mt9m111-check-write_bridge-for-timeout.patch delete mode 100644 queue-4.19/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch delete mode 100644 queue-4.19/media-gspca-mt9m111-check-write_bridge-for-timeout.patch delete mode 100644 queue-4.9/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch delete mode 100644 queue-4.9/media-gspca-mt9m111-check-write_bridge-for-timeout.patch diff --git a/queue-4.14/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch b/queue-4.14/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch deleted file mode 100644 index 5078bf8a393..00000000000 --- a/queue-4.14/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9d5b6e56226c74cf0f81f8f3b867a0cfc5519af8 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 1eea6c23976f..19b005cc8b00 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 f80f1757b58f..9deaeb72b2b4 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.14/media-gspca-mt9m111-check-write_bridge-for-timeout.patch b/queue-4.14/media-gspca-mt9m111-check-write_bridge-for-timeout.patch deleted file mode 100644 index 036241d1732..00000000000 --- a/queue-4.14/media-gspca-mt9m111-check-write_bridge-for-timeout.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1663366712ade866d5a8d9e447be0e560397107f 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 7d01ddd7ed01..da17c384e64d 100644 ---- a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -+++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -@@ -199,7 +199,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) { -@@ -217,15 +217,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.14/series b/queue-4.14/series index 7f473fb7140..0a1b59ced5c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -49,11 +49,9 @@ 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 dmaengine-qcom_hidma-comment-platform_driver_registe.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 diff --git a/queue-4.19/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch b/queue-4.19/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch deleted file mode 100644 index dfeb6baec96..00000000000 --- a/queue-4.19/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 87580fefb4311541196a4b8d3adb09fe6952e627 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 4e94b22eaada..4d1f6d44e88c 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 987ebae8ea0e..183259e26bd1 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.19/media-gspca-mt9m111-check-write_bridge-for-timeout.patch b/queue-4.19/media-gspca-mt9m111-check-write_bridge-for-timeout.patch deleted file mode 100644 index 42f759bff2c..00000000000 --- a/queue-4.19/media-gspca-mt9m111-check-write_bridge-for-timeout.patch +++ /dev/null @@ -1,58 +0,0 @@ -From b3ba1364f17c610cf5bc72a5ddc46ce568b1ae80 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 c9947c4a0f63..5f7216c3e34d 100644 ---- a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -+++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -@@ -199,7 +199,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) { -@@ -217,15 +217,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.19/series b/queue-4.19/series index d8d64340eb8..8468eaa51a6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -79,12 +79,10 @@ 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 dmaengine-qcom_hidma-comment-platform_driver_registe.patch libertas-register-sysfs-groups-properly.patch asoc-cs43130-handle-errors-in-cs43130_probe-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 diff --git a/queue-4.9/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch b/queue-4.9/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch deleted file mode 100644 index 9b46b12353c..00000000000 --- a/queue-4.9/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 90b9c53311021ecbcfefa482628b3df30f45eec4 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 73eab12cb3bd..1d6726744949 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.9/media-gspca-mt9m111-check-write_bridge-for-timeout.patch b/queue-4.9/media-gspca-mt9m111-check-write_bridge-for-timeout.patch deleted file mode 100644 index ed65d62b091..00000000000 --- a/queue-4.9/media-gspca-mt9m111-check-write_bridge-for-timeout.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d4ca5b8144fe12fb36124819a02abb386cd5df78 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 7d01ddd7ed01..da17c384e64d 100644 ---- a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -+++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c -@@ -199,7 +199,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) { -@@ -217,15 +217,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.9/series b/queue-4.9/series index 4d77c0a4c82..97e243bfeb6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -42,11 +42,9 @@ 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 dmaengine-qcom_hidma-comment-platform_driver_registe.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 -- 2.47.3