mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
Merge remote-tracking branch 'regulator/topic/as3711' into regulator-next
This commit is contained in:
commit
20ab4a7a79
1 changed files with 1 additions and 1 deletions
|
@ -303,7 +303,7 @@ static int as3711_regulator_probe(struct platform_device *pdev)
|
|||
reg_data = pdata ? pdata->init_data[id] : NULL;
|
||||
|
||||
/* No need to register if there is no regulator data */
|
||||
if (!ri->desc.name)
|
||||
if (!reg_data)
|
||||
continue;
|
||||
|
||||
reg = ®s[id];
|
||||
|
|
Loading…
Reference in a new issue