summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Butera <ebutera@users.berlios.de>2012-05-09 11:27:59 +0200
committerTony Lindgren <tony@atomide.com>2012-05-09 08:12:05 -0700
commit1a21932edc10de0dfd843797427719e5da43355b (patch)
treebaad18412767a6fd0e044e233acb837637ee824c
parent08ca7444f589bedf9ad5d82883e5d0754852d73b (diff)
downloadop-kernel-dev-1a21932edc10de0dfd843797427719e5da43355b.zip
op-kernel-dev-1a21932edc10de0dfd843797427719e5da43355b.tar.gz
ARM: OMAP: igep0020: fix smsc911x dummy regulator id
id 0 is already used and causes errors at boot: WARNING: at fs/sysfs/dir.c:508 sysfs_add_one+0x9c/0xac() sysfs: cannot create duplicate filename '/devices/platform/reg-fixed-voltage.0' Fix it by using the next available one (id=1). This was caused by 5b3689f4 (ARM: OMAP2+: smsc911x: Add fixed board regulators) that did not account for some regulators already being used. Signed-off-by: Enrico Butera <ebutera@users.berlios.de> [tony@atomide.com: updated comments for regression causing commit] Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 930c0d3..740cee9 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -641,7 +641,7 @@ static struct regulator_consumer_supply dummy_supplies[] = {
static void __init igep_init(void)
{
- regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+ regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies));
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
/* Get IGEP2 hardware revision */
OpenPOWER on IntegriCloud