Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6abb7c25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fc16e884 51b919ba

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7088,7 +7088,7 @@ F: include/uapi/sound/ 
F:	sound/



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@ti.com>

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

drivers/regulator/dbx500-prcmu.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/module.h>



#include "dbx500-prcmu.h"

drivers/regulator/tps80031-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev) 
			}

		}

		rdev = regulator_register(&ri->rinfo->desc, &config);

		if (IS_ERR_OR_NULL(rdev)) {

		if (IS_ERR(rdev)) {

			dev_err(&pdev->dev,

				"register regulator failed %s\n",

					ri->rinfo->desc.name);