tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
"Fairly small stuff - a build failure fix for ST platforms, an error
checking fix and an update to the MAINTAINERS file for Liam."

* tag 'regulator-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: tps80031: Use IS_ERR to check return value of regulator_register()
regulators: db8500: Fix compile failure for drivers/regulator/dbx500-prcmu.c
regulator: MAINTAINERS: update email address

Linus Torvalds 6abb7c25 fc16e884

+3 -2
+1 -1
MAINTAINERS
··· 7088 7088 F: sound/ 7089 7089 7090 7090 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) 7091 - M: Liam Girdwood <lrg@ti.com> 7091 + M: Liam Girdwood <lgirdwood@gmail.com> 7092 7092 M: Mark Brown <broonie@opensource.wolfsonmicro.com> 7093 7093 T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 7094 7094 L: alsa-devel@alsa-project.org (moderated for non-subscribers)
+1
drivers/regulator/dbx500-prcmu.c
··· 14 14 #include <linux/debugfs.h> 15 15 #include <linux/seq_file.h> 16 16 #include <linux/slab.h> 17 + #include <linux/module.h> 17 18 18 19 #include "dbx500-prcmu.h" 19 20
+1 -1
drivers/regulator/tps80031-regulator.c
··· 728 728 } 729 729 } 730 730 rdev = regulator_register(&ri->rinfo->desc, &config); 731 - if (IS_ERR_OR_NULL(rdev)) { 731 + if (IS_ERR(rdev)) { 732 732 dev_err(&pdev->dev, 733 733 "register regulator failed %s\n", 734 734 ri->rinfo->desc.name);