mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
regulator: twl-regulator: Simplify the code matching regulator id
This patch makes the code easier to read. Also add checking the case when no desc id is matched. This is required because if no desc id is matched, the poiner info is pointed to twl_of_match[i].data which may be not NULL. Checking info is NULL or not latter does not catch the error. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
2e42a7dc40
commit
5ade39358f
1 changed files with 5 additions and 3 deletions
|
@ -1189,10 +1189,12 @@ static int __devinit twlreg_probe(struct platform_device *pdev)
|
|||
initdata = pdev->dev.platform_data;
|
||||
for (i = 0, info = NULL; i < ARRAY_SIZE(twl_of_match); i++) {
|
||||
info = twl_of_match[i].data;
|
||||
if (!info || info->desc.id != id)
|
||||
continue;
|
||||
break;
|
||||
if (info && info->desc.id == id)
|
||||
break;
|
||||
}
|
||||
if (i == ARRAY_SIZE(twl_of_match))
|
||||
return -ENODEV;
|
||||
|
||||
drvdata = initdata->driver_data;
|
||||
if (!drvdata)
|
||||
return -EINVAL;
|
||||
|
|
Loading…
Reference in a new issue