Commit 9979c1c7 authored Mar 08, 2016 by Vladimir Zapolskiy Committed by Dmitry Torokhov Mar 11, 2016

Input: snvs_pwrkey - fix returned value check of syscon_regmap_lookup_by_phandle()



On error syscon_regmap_lookup_by_phandle() returns ERR_PTR() value,
which makes a check for NULL invalid and may lead to oops on error
path.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent 62d5bdf9

drivers/input/keyboard/snvs_pwrkey.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -111,9 +111,9 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
		return -ENOMEM;

		pdata->snvs = syscon_regmap_lookup_by_phandle(np, "regmap");
		if (!pdata->snvs) {
		if (IS_ERR(pdata->snvs)) {
		dev_err(&pdev->dev, "Can't get snvs syscon\n");
		return -ENODEV;
		return PTR_ERR(pdata->snvs);
		}

		if (of_property_read_u32(np, "linux,keycode", &pdata->keycode)) {