Merge remote-tracking branch 'regulator/for-linus' into regulator-next
This commit is contained in:
commit
12f457dd78
|
@ -2856,8 +2856,8 @@ void regulator_unregister(struct regulator_dev *rdev)
|
||||||
list_del(&rdev->list);
|
list_del(&rdev->list);
|
||||||
if (rdev->supply)
|
if (rdev->supply)
|
||||||
regulator_put(rdev->supply);
|
regulator_put(rdev->supply);
|
||||||
device_unregister(&rdev->dev);
|
|
||||||
kfree(rdev->constraints);
|
kfree(rdev->constraints);
|
||||||
|
device_unregister(&rdev->dev);
|
||||||
mutex_unlock(®ulator_list_mutex);
|
mutex_unlock(®ulator_list_mutex);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(regulator_unregister);
|
EXPORT_SYMBOL_GPL(regulator_unregister);
|
||||||
|
|
Loading…
Reference in New Issue