xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.5-rc4' into regulator-drivers

Browse Source 
Linux 3.5-rc4 contains patches which conflict with some of the
development work.
This commit is contained in:
Mark Brown
2012-06-25 10:11:40 +01:00
parent 2f6ae6ef63 6b16351acb
commit 85e63343f4
796 changed files with 10388 additions and 4483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/regulator/palmas-regulator.c
View File

@@ -775,9 +775,6 @@ static __devinit int palmas_probe(struct platform_device *pdev)
err_unregister_regulator:
while (--id >= 0)
regulator_unregister(pmic->rdev[id]);
kfree(pmic->rdev);
kfree(pmic->desc);
kfree(pmic);
return ret;
}
@@ -788,10 +785,6 @@ static int __devexit palmas_remove(struct platform_device *pdev)
for (id = 0; id < PALMAS_NUM_REGS; id++)
regulator_unregister(pmic->rdev[id]);
kfree(pmic->rdev);
kfree(pmic->desc);
kfree(pmic);
return 0;
}