summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChao Xie <chao.xie@marvell.com>2013-06-14 07:21:46 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-18 01:05:52 +0200
commit46223a19ad566dee955969c9a2cea55ef59f21d8 (patch)
treec8878409744fa3cfbd4bb8d8b8075b237bdb116b /drivers
parentmfd: 88pm800: Fix NULL pointer dereference (diff)
downloadlinux-46223a19ad566dee955969c9a2cea55ef59f21d8.tar.xz
linux-46223a19ad566dee955969c9a2cea55ef59f21d8.zip
mfd: 88pm80x: Fix driver name for 88pm800 and 88pm805
88pm800 and 88pm805 shouldnot have the same driver name. Signed-off-by: Chao Xie <chao.xie@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/88pm800.c2
-rw-r--r--drivers/mfd/88pm805.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index b2f9f0f9deb3..080104988d5e 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -569,7 +569,7 @@ static int pm800_remove(struct i2c_client *client)
static struct i2c_driver pm800_driver = {
.driver = {
- .name = "88PM80X",
+ .name = "88PM800",
.owner = THIS_MODULE,
.pm = &pm80x_pm_ops,
},
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index 65d7ac099b20..d32b54464e85 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -276,7 +276,7 @@ static int pm805_remove(struct i2c_client *client)
static struct i2c_driver pm805_driver = {
.driver = {
- .name = "88PM80X",
+ .name = "88PM805",
.owner = THIS_MODULE,
.pm = &pm80x_pm_ops,
},