drop usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch from 4.19...

diff --git a/queue-4.19/series b/queue-4.19/series
index 664985ee065840a407910f6dfa8dcf9a13ad65b5..0ad89bbc82e9a9eca85853888d40cc12def271d1 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -23,7 +23,6 @@ usb-storage-add-quirk-to-defeat-kindle-s-automatic-unload.patch
 usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch
 usb-replace-hardcode-maximum-usb-string-length-by-definition.patch
 usb-gadget-configfs-fix-kasan-use-after-free.patch
-usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch
 iio-adc-stm32-adc-add-has_iomem-dependency.patch
 iio-adc-qcom-spmi-vadc-add-default-scale-to-lr_mux2_bat_id-channel.patch
 iio-adis16400-fix-an-error-code-in-adis16400_initial_setup.patch

diff --git a/queue-4.19/usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch b/queue-4.19/usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch
deleted file mode 100644 (file)
index a835b8f..0000000
--- a/queue-4.19/usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3cac9104bea41099cf622091f0c0538bcb19050d Mon Sep 17 00:00:00 2001
-From: Elias Rudberg <mail@eliasrudberg.se>
-Date: Thu, 11 Mar 2021 13:47:10 +0100
-Subject: usb: typec: Remove vdo[3] part of tps6598x_rx_identity_reg struct
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Elias Rudberg <mail@eliasrudberg.se>
-
-commit 3cac9104bea41099cf622091f0c0538bcb19050d upstream.
-
-Remove the unused "u32 vdo[3]" part in the tps6598x_rx_identity_reg
-struct. This helps avoid "failed to register partner" errors which
-happen when tps6598x_read_partner_identity() fails because the
-amount of data read is 12 bytes smaller than the struct size.
-Note that vdo[3] is already in usb_pd_identity and hence
-shouldn't be added to tps6598x_rx_identity_reg as well.
-
-Fixes: f6c56ca91b92 ("usb: typec: Add the Product Type VDOs to struct usb_pd_identity")
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Reviewed-by: Guido Günther <agx@sigxcpu.org>
-Signed-off-by: Elias Rudberg <mail@eliasrudberg.se>
-Cc: stable <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20210311124710.6563-1-mail@eliasrudberg.se
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/typec/tps6598x.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/usb/typec/tps6598x.c
-+++ b/drivers/usb/typec/tps6598x.c
-@@ -59,7 +59,6 @@ enum {
- struct tps6598x_rx_identity_reg {
-       u8 status;
-       struct usb_pd_identity identity;
--      u32 vdo[3];
- } __packed;
- 
- /* Standard Task return codes */

diff --git a/queue-5.4/series b/queue-5.4/series
index 9c72e0c556f63e3b84085c5dbb3c2e6f0276abaa..2d9253cd687aca07b73ba62ac1bc69f19aa2b9e5 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -35,7 +35,6 @@ usb-storage-add-quirk-to-defeat-kindle-s-automatic-unload.patch
 usbip-fix-incorrect-double-assignment-to-udc-ud.tcp_rx.patch
 usb-replace-hardcode-maximum-usb-string-length-by-definition.patch
 usb-gadget-configfs-fix-kasan-use-after-free.patch
-usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch
 usb-typec-tcpm-invoke-power_supply_changed-for-tcpm-source-psy.patch
 iio-adc-stm32-adc-add-has_iomem-dependency.patch
 iio-adc-qcom-spmi-vadc-add-default-scale-to-lr_mux2_bat_id-channel.patch

diff --git a/queue-5.4/usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch b/queue-5.4/usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch
deleted file mode 100644 (file)
index b7d6484..0000000
--- a/queue-5.4/usb-typec-remove-vdo-part-of-tps6598x_rx_identity_reg-struct.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3cac9104bea41099cf622091f0c0538bcb19050d Mon Sep 17 00:00:00 2001
-From: Elias Rudberg <mail@eliasrudberg.se>
-Date: Thu, 11 Mar 2021 13:47:10 +0100
-Subject: usb: typec: Remove vdo[3] part of tps6598x_rx_identity_reg struct
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Elias Rudberg <mail@eliasrudberg.se>
-
-commit 3cac9104bea41099cf622091f0c0538bcb19050d upstream.
-
-Remove the unused "u32 vdo[3]" part in the tps6598x_rx_identity_reg
-struct. This helps avoid "failed to register partner" errors which
-happen when tps6598x_read_partner_identity() fails because the
-amount of data read is 12 bytes smaller than the struct size.
-Note that vdo[3] is already in usb_pd_identity and hence
-shouldn't be added to tps6598x_rx_identity_reg as well.
-
-Fixes: f6c56ca91b92 ("usb: typec: Add the Product Type VDOs to struct usb_pd_identity")
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Reviewed-by: Guido Günther <agx@sigxcpu.org>
-Signed-off-by: Elias Rudberg <mail@eliasrudberg.se>
-Cc: stable <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20210311124710.6563-1-mail@eliasrudberg.se
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/typec/tps6598x.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/usb/typec/tps6598x.c
-+++ b/drivers/usb/typec/tps6598x.c
-@@ -61,7 +61,6 @@ enum {
- struct tps6598x_rx_identity_reg {
-       u8 status;
-       struct usb_pd_identity identity;
--      u32 vdo[3];
- } __packed;
- 
- /* Standard Task return codes */