summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2019-01-29 12:25:53 +0100
committerLee Jones <lee.jones@linaro.org>2019-02-07 11:43:15 +0100
commit83761f9663a228f148ee318cc0531035cfa5654c (patch)
treeb896a5e2052a844e48e4b0e76da4a06d01b3e1bf /drivers/mfd
parentmfd: sm501: Use struct_size() in devm_kzalloc() (diff)
downloadlinux-83761f9663a228f148ee318cc0531035cfa5654c.tar.xz
linux-83761f9663a228f148ee318cc0531035cfa5654c.zip
mfd: sec-core: Return gracefully instead of BUG() if device cannot match
Replace impossible BUG() in probe with a proper return. This can be triggered only in case of a clear bug (e.g. adding broken half-support for new S2MPSXX flavor) but BUG() is discouraged and the boot process can actually try to continue. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/sec-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index e0835c9df7a1..00321011de0a 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -471,8 +471,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
break;
default:
- /* If this happens the probe function is problem */
- BUG();
+ dev_err(&i2c->dev, "Unsupported device type (%lu)\n",
+ sec_pmic->device_type);
+ return -ENODEV;
}
ret = devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs,
NULL, 0, NULL);