aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ab3100-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/ab3100-core.c')
-rw-r--r--drivers/mfd/ab3100-core.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 4193af5f274..a751927047a 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -613,7 +613,7 @@ static void ab3100_setup_debugfs(struct ab3100 *ab3100)
613 ab3100_get_priv.ab3100 = ab3100; 613 ab3100_get_priv.ab3100 = ab3100;
614 ab3100_get_priv.mode = false; 614 ab3100_get_priv.mode = false;
615 ab3100_get_reg_file = debugfs_create_file("get_reg", 615 ab3100_get_reg_file = debugfs_create_file("get_reg",
616 S_IWUGO, ab3100_dir, &ab3100_get_priv, 616 S_IWUSR, ab3100_dir, &ab3100_get_priv,
617 &ab3100_get_set_reg_fops); 617 &ab3100_get_set_reg_fops);
618 if (!ab3100_get_reg_file) { 618 if (!ab3100_get_reg_file) {
619 err = -ENOMEM; 619 err = -ENOMEM;
@@ -623,7 +623,7 @@ static void ab3100_setup_debugfs(struct ab3100 *ab3100)
623 ab3100_set_priv.ab3100 = ab3100; 623 ab3100_set_priv.ab3100 = ab3100;
624 ab3100_set_priv.mode = true; 624 ab3100_set_priv.mode = true;
625 ab3100_set_reg_file = debugfs_create_file("set_reg", 625 ab3100_set_reg_file = debugfs_create_file("set_reg",
626 S_IWUGO, ab3100_dir, &ab3100_set_priv, 626 S_IWUSR, ab3100_dir, &ab3100_set_priv,
627 &ab3100_get_set_reg_fops); 627 &ab3100_get_set_reg_fops);
628 if (!ab3100_set_reg_file) { 628 if (!ab3100_set_reg_file) {
629 err = -ENOMEM; 629 err = -ENOMEM;
@@ -949,10 +949,8 @@ static int __devinit ab3100_probe(struct i2c_client *client,
949 goto exit_no_ops; 949 goto exit_no_ops;
950 950
951 /* Set up and register the platform devices. */ 951 /* Set up and register the platform devices. */
952 for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) { 952 for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++)
953 ab3100_devs[i].platform_data = ab3100_plf_data; 953 ab3100_devs[i].mfd_data = ab3100_plf_data;
954 ab3100_devs[i].data_size = sizeof(struct ab3100_platform_data);
955 }
956 954
957 err = mfd_add_devices(&client->dev, 0, ab3100_devs, 955 err = mfd_add_devices(&client->dev, 0, ab3100_devs,
958 ARRAY_SIZE(ab3100_devs), NULL, 0); 956 ARRAY_SIZE(ab3100_devs), NULL, 0);