]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop umn.edu patches from 4.9, 4.19, and 4.14 queues
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 31 May 2021 11:33:57 +0000 (13:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 31 May 2021 11:33:57 +0000 (13:33 +0200)
queue-4.14/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch [deleted file]
queue-4.14/media-gspca-mt9m111-check-write_bridge-for-timeout.patch [deleted file]
queue-4.14/series
queue-4.19/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch [deleted file]
queue-4.19/media-gspca-mt9m111-check-write_bridge-for-timeout.patch [deleted file]
queue-4.19/series
queue-4.9/ath6kl-return-error-code-in-ath6kl_wmi_set_roam_lrss.patch [deleted file]
queue-4.9/media-gspca-mt9m111-check-write_bridge-for-timeout.patch [deleted file]
queue-4.9/series

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 (file)
index 5078bf8..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9d5b6e56226c74cf0f81f8f3b867a0cfc5519af8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 May 2021 13:57:10 +0200
-Subject: ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()
-
-From: Anirudh Rayabharam <mail@anirudhrb.com>
-
-[ Upstream commit fc6a6521556c8250e356ddc6a3f2391aa62dc976 ]
-
-ath6kl_wmi_cmd_send could fail, so let's return its error code upstream.
-
-Signed-off-by: Kangjie Lu <kjlu@umn.edu>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 (file)
index 036241d..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1663366712ade866d5a8d9e447be0e560397107f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 May 2021 13:57:28 +0200
-Subject: media: gspca: mt9m111: Check write_bridge for timeout
-
-From: Alaa Emad <alaaemadhossney.ae@gmail.com>
-
-[ 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 <pakki001@umn.edu>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 7f473fb71401ac2e3ba47ec48763c659ffa372d2..0a1b59ced5c5a5294e7c3a6047fa4bf04f361084 100644 (file)
@@ -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 (file)
index dfeb6ba..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 87580fefb4311541196a4b8d3adb09fe6952e627 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 May 2021 13:57:10 +0200
-Subject: ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()
-
-From: Anirudh Rayabharam <mail@anirudhrb.com>
-
-[ Upstream commit fc6a6521556c8250e356ddc6a3f2391aa62dc976 ]
-
-ath6kl_wmi_cmd_send could fail, so let's return its error code upstream.
-
-Signed-off-by: Kangjie Lu <kjlu@umn.edu>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 (file)
index 42f759b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From b3ba1364f17c610cf5bc72a5ddc46ce568b1ae80 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 May 2021 13:57:28 +0200
-Subject: media: gspca: mt9m111: Check write_bridge for timeout
-
-From: Alaa Emad <alaaemadhossney.ae@gmail.com>
-
-[ 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 <pakki001@umn.edu>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index d8d64340eb8fa44fb75b3b5abfe35eb09efbe44f..8468eaa51a6c688a7c2fbcee59ef4b7e831b3b38 100644 (file)
@@ -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 (file)
index 9b46b12..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 90b9c53311021ecbcfefa482628b3df30f45eec4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 May 2021 13:57:10 +0200
-Subject: ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()
-
-From: Anirudh Rayabharam <mail@anirudhrb.com>
-
-[ Upstream commit fc6a6521556c8250e356ddc6a3f2391aa62dc976 ]
-
-ath6kl_wmi_cmd_send could fail, so let's return its error code upstream.
-
-Signed-off-by: Kangjie Lu <kjlu@umn.edu>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 (file)
index ed65d62..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From d4ca5b8144fe12fb36124819a02abb386cd5df78 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 May 2021 13:57:28 +0200
-Subject: media: gspca: mt9m111: Check write_bridge for timeout
-
-From: Alaa Emad <alaaemadhossney.ae@gmail.com>
-
-[ 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 <pakki001@umn.edu>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 4d77c0a4c8231e6e9ce3d9cd0a3d805e43800bfe..97e243bfeb69643730de1e473e04802cd98fb35c 100644 (file)
@@ -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