Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f95e66 authored by Wei Yongjun's avatar Wei Yongjun Committed by Johannes Berg
Browse files

rfkill: fix error return code in rfkill_gpio_probe() 



Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
[fix some indentation on the way]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8ceb5955

net/rfkill/rfkill-gpio.c

+5 −2
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev) 
		rfkill->pwr_clk = clk_get(&pdev->dev, pdata->power_clk_name);

		if (IS_ERR(rfkill->pwr_clk)) {

			pr_warn("%s: can't find pwr_clk.\n", __func__);

			ret = PTR_ERR(rfkill->pwr_clk);

			goto fail_shutdown_name;

		}

	}
@@ -153,8 +154,10 @@ static int rfkill_gpio_probe(struct platform_device *pdev) 


	rfkill->rfkill_dev = rfkill_alloc(pdata->name, &pdev->dev, pdata->type,

					  &rfkill_gpio_ops, rfkill);

	if (!rfkill->rfkill_dev)

	if (!rfkill->rfkill_dev) {

		ret = -ENOMEM;

		goto fail_shutdown;

	}



	ret = rfkill_register(rfkill->rfkill_dev);

	if (ret < 0)