leds: tlc591xx: fix return value check in tlc591xx_probe()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 6 Apr 2021 13:11:59 +0000 (21:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:05:37 +0000 (16:05 +0200)
[ Upstream commit ee522bcf026ec82ada793979c3a906274430595a ]

After device_get_match_data(), tlc591xx is not checked, add
check for it and also check np after dev_of_node.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/leds/leds-tlc591xx.c

index 5b9dfdf..cb7bd13 100644 (file)
@@ -148,16 +148,20 @@ static int
 tlc591xx_probe(struct i2c_client *client,
               const struct i2c_device_id *id)
 {
-       struct device_node *np = dev_of_node(&client->dev), *child;
+       struct device_node *np, *child;
        struct device *dev = &client->dev;
        const struct tlc591xx *tlc591xx;
        struct tlc591xx_priv *priv;
        int err, count, reg;
 
-       tlc591xx = device_get_match_data(dev);
+       np = dev_of_node(dev);
        if (!np)
                return -ENODEV;
 
+       tlc591xx = device_get_match_data(dev);
+       if (!tlc591xx)
+               return -ENODEV;
+
        count = of_get_available_child_count(np);
        if (!count || count > tlc591xx->max_leds)
                return -EINVAL;