From 00ee3a13a91be0ac250b89873043a3d2508f1208 Mon Sep 17 00:00:00 2001 From: Stefan Wahren Date: Sat, 26 May 2018 12:24:00 +0200 Subject: mailbox: bcm2835: Fix of_xlate return value The bcm2835-mailbox returns NULL instead of an error pointer, which could result in a NULL ptr dereference in mbox_request_channel. So fix this by returning a proper error pointer. Signed-off-by: Stefan Wahren Fixes: 0bae6af6d704 ("mailbox: Enable BCM2835 mailbox support") Reviewed-by: Eric Anholt Signed-off-by: Jassi Brar --- drivers/mailbox/bcm2835-mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c index cfb4b44..e92bbc5 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -134,7 +134,7 @@ static struct mbox_chan *bcm2835_mbox_index_xlate(struct mbox_controller *mbox, const struct of_phandle_args *sp) { if (sp->args_count != 0) - return NULL; + return ERR_PTR(-EINVAL); return &mbox->chans[0]; } -- cgit v1.1