diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-11-09 04:02:01 (GMT) |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-11-09 04:02:01 (GMT) |
commit | 3871608e4cb995b0fb9c630da9ac45b246151fef (patch) | |
tree | 1a7d65ae9b815e73ec9ffe00d6a3778ab66d5dc8 /drivers/mfd/ab8500-sysctrl.c | |
parent | d177d7df2673ea81e8ee1e3d468398eeb7e580f5 (diff) | |
parent | 5caae9d1419914177994363218616b869659e871 (diff) | |
download | linux-3871608e4cb995b0fb9c630da9ac45b246151fef.tar.xz |
Merge tag 'v4.9.61' into linux-linaro-lsk-v4.9
This is the 4.9.61 stable release
Diffstat (limited to 'drivers/mfd/ab8500-sysctrl.c')
-rw-r--r-- | drivers/mfd/ab8500-sysctrl.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 207cc49..8062d37 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -98,7 +98,7 @@ int ab8500_sysctrl_read(u16 reg, u8 *value) u8 bank; if (sysctrl_dev == NULL) - return -EINVAL; + return -EPROBE_DEFER; bank = (reg >> 8); if (!valid_bank(bank)) @@ -114,11 +114,13 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value) u8 bank; if (sysctrl_dev == NULL) - return -EINVAL; + return -EPROBE_DEFER; bank = (reg >> 8); - if (!valid_bank(bank)) + if (!valid_bank(bank)) { + pr_err("invalid bank\n"); return -EINVAL; + } return abx500_mask_and_set_register_interruptible(sysctrl_dev, bank, (u8)(reg & 0xFF), mask, value); @@ -145,9 +147,15 @@ static int ab8500_sysctrl_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id ab8500_sysctrl_match[] = { + { .compatible = "stericsson,ab8500-sysctrl", }, + {} +}; + static struct platform_driver ab8500_sysctrl_driver = { .driver = { .name = "ab8500-sysctrl", + .of_match_table = ab8500_sysctrl_match, }, .probe = ab8500_sysctrl_probe, .remove = ab8500_sysctrl_remove, |