Skip to contentSkip to conversation

media: allegro: fix an error pointer vs NULL check

PATCH In review Dan Carpenter 2 participants 2 messages Jul 22, 2020

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

PATCH 1/1 media: allegro: fix an error pointer vs NULL check

The allegro_mbox_init() function returns error pointers, it never returns NULL.

Fixes 94dc76560261 ("media: allegro: rework mbox handling")
---
 drivers/staging/media/allegro-dvt/allegro-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/allegro-dvt/allegro-core.c +1 -1
index 61beae1fca36..9f718f43282b 100644
@@ -2952,7 +2952,7 @@ static int allegro_mcu_hw_init(struct allegro_dev *dev,
 					      info->mailbox_size);
 	dev->mbox_status = allegro_mbox_init(dev, info->mailbox_status,
 					     info->mailbox_size);
-	if (!dev->mbox_command || !dev->mbox_status) {
+	if (IS_ERR(dev->mbox_command) || IS_ERR(dev->mbox_status)) {
 		v4l2_err(&dev->v4l2_dev,
 			 "failed to initialize mailboxes\n");
 		return -EIO;
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

The allegro_mbox_init() function returns error pointers, it never returns NULL.

Fixes 94dc76560261 ("media: allegro: rework mbox handling")
Quoted 21 lines
---
 drivers/staging/media/allegro-dvt/allegro-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/allegro-dvt/allegro-core.c +1 -1
index 61beae1fca36..9f718f43282b 100644
@@ -2952,7 +2952,7 @@ static int allegro_mcu_hw_init(struct allegro_dev *dev,
 					      info->mailbox_size);
 	dev->mbox_status = allegro_mbox_init(dev, info->mailbox_status,
 					     info->mailbox_size);
-	if (!dev->mbox_command || !dev->mbox_status) {
+	if (IS_ERR(dev->mbox_command) || IS_ERR(dev->mbox_status)) {
 		v4l2_err(&dev->v4l2_dev,
 			 "failed to initialize mailboxes\n");
 		return -EIO;
Signature · 1 line
2.27.0