Drop alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch b/queue-4.14/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
deleted file mode 100644 (file)
index d868615..0000000
--- a/queue-4.14/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6de3c9e3f6b3eaf66859e1379b3f35dda781416b Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 15 Aug 2019 11:41:06 +0200
-Subject: ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 6de3c9e3f6b3eaf66859e1379b3f35dda781416b upstream.
-
-The quirk function snd_emuusb_set_samplerate() has a NULL check for
-the mixer element, but this is useless in the current code.  It used
-to be a check against mixer->id_elems[unitid] but it was changed later
-to the value after mixer_eleme_list_to_info() which is always non-NULL
-due to the container_of() usage.
-
-This patch fixes the check before the conversion.
-
-While we're at it, correct a typo in the comment in the function,
-too.
-
-Fixes: 8c558076c740 ("ALSA: usb-audio: Clean up mixer element list traverse")
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/usb/mixer_quirks.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -1169,17 +1169,17 @@ void snd_emuusb_set_samplerate(struct sn
- {
-       struct usb_mixer_interface *mixer;
-       struct usb_mixer_elem_info *cval;
--      int unitid = 12; /* SamleRate ExtensionUnit ID */
-+      int unitid = 12; /* SampleRate ExtensionUnit ID */
- 
-       list_for_each_entry(mixer, &chip->mixer_list, list) {
--              cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
--              if (cval) {
-+              if (mixer->id_elems[unitid]) {
-+                      cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
-                       snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR,
-                                                   cval->control << 8,
-                                                   samplerate_id);
-                       snd_usb_mixer_notify_id(mixer, unitid);
-+                      break;
-               }
--              break;
-       }
- }
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 57de09fb04c4c681b8e90b7c3842ebaf68294c26..6a16e4eab32b68168c4f34fe8e0b235096a18580 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -73,6 +73,5 @@ sunrpc-fixed-rollback-in-rpc_gssd_dummy_populate.patch
 sunrpc-properly-set-the-subbuf-parameter-of-xdr_buf_subsegment.patch
 pnfs-flexfiles-fix-list-corruption-if-the-mirror-count-changes.patch
 nfsv4-fix-close-not-waiting-for-direct-io-compeletion.patch
-alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
 xfs-add-agf-freeblocks-verify-in-xfs_agf_verify.patch
 revert-tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch

diff --git a/queue-4.4/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch b/queue-4.4/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
deleted file mode 100644 (file)
index 7f7a169..0000000
--- a/queue-4.4/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6de3c9e3f6b3eaf66859e1379b3f35dda781416b Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 15 Aug 2019 11:41:06 +0200
-Subject: ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 6de3c9e3f6b3eaf66859e1379b3f35dda781416b upstream.
-
-The quirk function snd_emuusb_set_samplerate() has a NULL check for
-the mixer element, but this is useless in the current code.  It used
-to be a check against mixer->id_elems[unitid] but it was changed later
-to the value after mixer_eleme_list_to_info() which is always non-NULL
-due to the container_of() usage.
-
-This patch fixes the check before the conversion.
-
-While we're at it, correct a typo in the comment in the function,
-too.
-
-Fixes: 8c558076c740 ("ALSA: usb-audio: Clean up mixer element list traverse")
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/usb/mixer_quirks.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -1168,17 +1168,17 @@ void snd_emuusb_set_samplerate(struct sn
- {
-       struct usb_mixer_interface *mixer;
-       struct usb_mixer_elem_info *cval;
--      int unitid = 12; /* SamleRate ExtensionUnit ID */
-+      int unitid = 12; /* SampleRate ExtensionUnit ID */
- 
-       list_for_each_entry(mixer, &chip->mixer_list, list) {
--              cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
--              if (cval) {
-+              if (mixer->id_elems[unitid]) {
-+                      cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
-                       snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR,
-                                                   cval->control << 8,
-                                                   samplerate_id);
-                       snd_usb_mixer_notify_id(mixer, unitid);
-+                      break;
-               }
--              break;
-       }
- }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index 71669b94cec2130202b7fd8ccc31ce594e678798..47d9a9a77f20dde06214011b334e885a5bc1b48f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -131,5 +131,4 @@ sunrpc-properly-set-the-subbuf-parameter-of-xdr_buf_subsegment.patch
 pnfs-flexfiles-fix-list-corruption-if-the-mirror-count-changes.patch
 nfsv4-fix-close-not-waiting-for-direct-io-compeletion.patch
 pci-disable-msi-for-hisilicon-hip06-hip07-only-in-root-port-mode.patch
-alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
 revert-tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch

diff --git a/queue-4.9/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch b/queue-4.9/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
deleted file mode 100644 (file)
index 7f7a169..0000000
--- a/queue-4.9/alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6de3c9e3f6b3eaf66859e1379b3f35dda781416b Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 15 Aug 2019 11:41:06 +0200
-Subject: ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 6de3c9e3f6b3eaf66859e1379b3f35dda781416b upstream.
-
-The quirk function snd_emuusb_set_samplerate() has a NULL check for
-the mixer element, but this is useless in the current code.  It used
-to be a check against mixer->id_elems[unitid] but it was changed later
-to the value after mixer_eleme_list_to_info() which is always non-NULL
-due to the container_of() usage.
-
-This patch fixes the check before the conversion.
-
-While we're at it, correct a typo in the comment in the function,
-too.
-
-Fixes: 8c558076c740 ("ALSA: usb-audio: Clean up mixer element list traverse")
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/usb/mixer_quirks.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/sound/usb/mixer_quirks.c
-+++ b/sound/usb/mixer_quirks.c
-@@ -1168,17 +1168,17 @@ void snd_emuusb_set_samplerate(struct sn
- {
-       struct usb_mixer_interface *mixer;
-       struct usb_mixer_elem_info *cval;
--      int unitid = 12; /* SamleRate ExtensionUnit ID */
-+      int unitid = 12; /* SampleRate ExtensionUnit ID */
- 
-       list_for_each_entry(mixer, &chip->mixer_list, list) {
--              cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
--              if (cval) {
-+              if (mixer->id_elems[unitid]) {
-+                      cval = mixer_elem_list_to_info(mixer->id_elems[unitid]);
-                       snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR,
-                                                   cval->control << 8,
-                                                   samplerate_id);
-                       snd_usb_mixer_notify_id(mixer, unitid);
-+                      break;
-               }
--              break;
-       }
- }
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index 7d1ca2aa782f9ecfb74ba9706ba41fff384141ad..9d4df49fafdcfa78c3c767d61d7560b145e4b78c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -186,6 +186,5 @@ sunrpc-fixed-rollback-in-rpc_gssd_dummy_populate.patch
 sunrpc-properly-set-the-subbuf-parameter-of-xdr_buf_subsegment.patch
 pnfs-flexfiles-fix-list-corruption-if-the-mirror-count-changes.patch
 nfsv4-fix-close-not-waiting-for-direct-io-compeletion.patch
-alsa-usb-audio-fix-invalid-null-check-in-snd_emuusb_set_samplerate.patch
 xfs-add-agf-freeblocks-verify-in-xfs_agf_verify.patch
 revert-tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch