Skip to contentSkip to conversation

media: saa7134: fix incorrect use to determine if list is empty

PATCH New Jakob Koschel 1 participant 1 message Feb 28, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: saa7134: fix incorrect use to determine if list is empty

'dev' will *always* be set by list_for_each_entry().
It is incorrect to assume that the iterator value will be NULL if the list is empty.

Instead of checking the pointer it should be checked if the list is empty.

Fixes 79dd0c69f05f ("V4L: 925: saa7134 alsa is now a standalone module")
---
 drivers/media/pci/saa7134/saa7134-alsa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/saa7134/saa7134-alsa.c +2 -2
index fb24d2ed3621..d3cde05a6eba 100644
@@ -1214,7 +1214,7 @@ static int alsa_device_exit(struct saa7134_dev *dev)
 
 static int saa7134_alsa_init(void)
 {
-	struct saa7134_dev *dev = NULL;
+	struct saa7134_dev *dev;
 
 	saa7134_dmasound_init = alsa_device_init;
 	saa7134_dmasound_exit = alsa_device_exit;
@@ -1229,7 +1229,7 @@ static int saa7134_alsa_init(void)
 			alsa_device_init(dev);
 	}
 
-	if (dev == NULL)
+	if (list_empty(&saa7134_devlist))
 		pr_info("saa7134 ALSA: no saa7134 cards found\n");
 
 	return 0;

base-commit: 7ee022567bf9e2e0b3cd92461a2f4986ecc99673

Signature · 1 line
2.25.1