From: Sasha Levin Date: Mon, 31 May 2021 21:43:16 +0000 (-0400) Subject: Drop alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch X-Git-Tag: v4.4.271~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcf89caad8e589fd95270160bd3c93deac299a2a;p=thirdparty%2Fkernel%2Fstable-queue.git Drop alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-4.14/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index a14e0256b7d..00000000000 --- a/queue-4.14/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7cbbe5db61e1c252555d43d17e9a8b765e37c724 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index d77dcba276b5..b0ef47bc6521 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -109,7 +109,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index 997d61b4859..7d7f0ec42bb 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -47,7 +47,6 @@ serial-max310x-unregister-uart-driver-in-case-of-fai.patch net-fujitsu-fix-potential-null-ptr-deref.patch 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 dmaengine-qcom_hidma-comment-platform_driver_registe.patch libertas-register-sysfs-groups-properly.patch diff --git a/queue-4.19/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-4.19/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index 68e29eb8914..00000000000 --- a/queue-4.19/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 59ba66346609fced64cd32721c8393318774d236 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index d77dcba276b5..b0ef47bc6521 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -109,7 +109,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 94ca4c96e2a..64761ad8b08 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -77,7 +77,6 @@ serial-max310x-unregister-uart-driver-in-case-of-fai.patch net-fujitsu-fix-potential-null-ptr-deref.patch 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 dmaengine-qcom_hidma-comment-platform_driver_registe.patch libertas-register-sysfs-groups-properly.patch diff --git a/queue-4.4/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-4.4/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index 7fa59038ba7..00000000000 --- a/queue-4.4/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From efa61248647fc1b8a9236102c16e94984cd2d593 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index b8e2391c33ff..4fa3b0f2a270 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -109,7 +109,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-4.4/series b/queue-4.4/series index d0d047d18d9..589ff7b6705 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -32,7 +32,6 @@ platform-x86-hp_accel-avoid-invoking-_ini-to-speed-u.patch net-fujitsu-fix-potential-null-ptr-deref.patch 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 libertas-register-sysfs-groups-properly.patch media-dvb-add-check-on-sp8870_readreg-return.patch diff --git a/queue-4.9/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-4.9/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index 3ad0326136e..00000000000 --- a/queue-4.9/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 25c7a22d62833b82a91f50224e110ac29e697faf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index ad42d2364199..ca4350bd24d1 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -109,7 +109,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index a7f59cd0841..bbd7c09bcca 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -40,7 +40,6 @@ serial-max310x-unregister-uart-driver-in-case-of-fai.patch net-fujitsu-fix-potential-null-ptr-deref.patch 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 dmaengine-qcom_hidma-comment-platform_driver_registe.patch libertas-register-sysfs-groups-properly.patch diff --git a/queue-5.10/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-5.10/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index f911b5b6b91..00000000000 --- a/queue-5.10/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0995498f9267828a1af20feabaadf857d1e9a6cb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index ae93191ffdc9..8b21920be4bb 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -94,7 +94,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-5.10/series b/queue-5.10/series index f4ed1960f2e..0b1577bfc97 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -143,7 +143,6 @@ net-caif-remove-bug_on-dev-null-in-caif_xmit.patch revert-char-hpet-fix-a-missing-check-of-ioremap.patch char-hpet-add-checks-after-calling-ioremap.patch revert-alsa-gus-add-a-check-of-the-status-of-snd_ctl.patch -alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch revert-alsa-usx2y-fix-potential-null-pointer-derefer.patch revert-isdn-misdninfineon-fix-potential-null-pointer.patch isdn-misdninfineon-check-cleanup-ioremap-failure-cor.patch diff --git a/queue-5.12/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-5.12/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index ea290bff7fa..00000000000 --- a/queue-5.12/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f6cdab7be98defd043097e7b2a4e46d0597ec6bd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index 95290ffe5c6e..ed3a87ebe3f4 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -93,7 +93,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-5.12/series b/queue-5.12/series index 76a526a0b34..d8a326f180e 100644 --- a/queue-5.12/series +++ b/queue-5.12/series @@ -173,7 +173,6 @@ net-caif-remove-bug_on-dev-null-in-caif_xmit.patch revert-char-hpet-fix-a-missing-check-of-ioremap.patch char-hpet-add-checks-after-calling-ioremap.patch revert-alsa-gus-add-a-check-of-the-status-of-snd_ctl.patch -alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch revert-alsa-usx2y-fix-potential-null-pointer-derefer.patch revert-isdn-misdninfineon-fix-potential-null-pointer.patch isdn-misdninfineon-check-cleanup-ioremap-failure-cor.patch diff --git a/queue-5.4/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch b/queue-5.4/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch deleted file mode 100644 index 29c302b2d5d..00000000000 --- a/queue-5.4/alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c5a194b883ad82be25a994bc6cc48d25ddb06ea0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 May 2021 13:57:02 +0200 -Subject: ALSA: sb8: Add a comment note regarding an unused pointer - -From: Atul Gopinathan - -[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ] - -The field "fm_res" of "struct snd_sb8" is never used/dereferenced -throughout the sb8.c code. Therefore there is no need for any null value -check after the "request_region()". - -Add a comment note to make developers know about this and prevent any -"NULL check" patches on this part of code. - -Cc: Takashi Iwai -Signed-off-by: Atul Gopinathan -Link: https://lore.kernel.org/r/20210503115736.2104747-36-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - sound/isa/sb/sb8.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c -index 6f1fc8789676..4386c24d2dcc 100644 ---- a/sound/isa/sb/sb8.c -+++ b/sound/isa/sb/sb8.c -@@ -94,7 +94,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) - acard = card->private_data; - card->private_free = snd_sb8_free; - -- /* block the 0x388 port to avoid PnP conflicts */ -+ /* -+ * Block the 0x388 port to avoid PnP conflicts. -+ * No need to check this value after request_region, -+ * as we never do anything with it. -+ */ - acard->fm_res = request_region(0x388, 4, "SoundBlaster FM"); - - if (port[dev] != SNDRV_AUTO_PORT) { --- -2.30.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 9dfad70ca30..b8ab2385b91 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -96,7 +96,6 @@ net-caif-remove-bug_on-dev-null-in-caif_xmit.patch revert-char-hpet-fix-a-missing-check-of-ioremap.patch char-hpet-add-checks-after-calling-ioremap.patch revert-alsa-gus-add-a-check-of-the-status-of-snd_ctl.patch -alsa-sb8-add-a-comment-note-regarding-an-unused-poin.patch revert-alsa-usx2y-fix-potential-null-pointer-derefer.patch revert-isdn-misdninfineon-fix-potential-null-pointer.patch isdn-misdninfineon-check-cleanup-ioremap-failure-cor.patch