Skip to content

Commit c84eab5

Browse files
x2018andy-shev
authored andcommitted
gpio: merrifield: check the return value of devm_kstrdup()
devm_kstrdup() returns pointer to allocated string on success, NULL on failure. So it is better to check the return value of it. Before, if devm_kstrdup() fails, pinctrl_dev_name will be NULL, then the retval below will be a negative error-code (inside gpiochip_add_pin_range(), pinctrl_find_and_add_gpio_range()->get_pinctrl_dev_from_devname() will finally check pinctrl_dev_name and return an error), so the failure of devm_kstrdup() can be only implicitly caught after a long call chain. While this patch is to explicitly catch the failure in time. Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 06608bc commit c84eab5

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/gpio/gpio-merrifield.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,9 @@ static int mrfld_gpio_add_pin_ranges(struct gpio_chip *chip)
409409
int retval;
410410

411411
pinctrl_dev_name = mrfld_gpio_get_pinctrl_dev_name(priv);
412+
if (!pinctrl_dev_name)
413+
return -ENOMEM;
414+
412415
for (i = 0; i < ARRAY_SIZE(mrfld_gpio_ranges); i++) {
413416
range = &mrfld_gpio_ranges[i];
414417
retval = gpiochip_add_pin_range(&priv->chip, pinctrl_dev_name,

0 commit comments

Comments
 (0)