diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-24 19:42:43 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-24 20:53:15 +0200 |
| commit | d4e2385c691101d0bf412f7c5fecfc279eb919c7 (patch) | |
| tree | 6ea4384bb663d7114c3a17f5b11e61442bdd43fa /drivers/power | |
| parent | 10e48b7d73487114bdd13bc1ebd10b6ba62de25b (diff) | |
| parent | 648b8eba20d0bdce9de41df97677e70aa53693ea (diff) | |
| download | linux-d4e2385c691101d0bf412f7c5fecfc279eb919c7.tar.bz2 | |
Merge branch 'fixes' into for-next
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/power/supply/act8945a_charger.c | 4 | ||||
| -rw-r--r-- | drivers/power/supply/sbs-battery.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 15c80c7f8f9e..6a8bab7ae27b 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -378,6 +378,7 @@ config BATTERY_RX51 config CHARGER_CPCAP tristate "CPCAP PMIC Charger Driver" depends on MFD_CPCAP && IIO + depends on OMAP_USB2 || (!OMAP_USB2 && COMPILE_TEST) default MFD_CPCAP help Say Y to enable support for CPCAP PMIC charger driver for Motorola diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c index d1eb2e359532..8e117b31ba79 100644 --- a/drivers/power/supply/act8945a_charger.c +++ b/drivers/power/supply/act8945a_charger.c @@ -596,9 +596,9 @@ static int act8945a_charger_probe(struct platform_device *pdev) return ret; irq = of_irq_get(pdev->dev.of_node, 0); - if (irq == -EPROBE_DEFER) { + if (irq <= 0) { dev_err(&pdev->dev, "failed to find IRQ number\n"); - return -EPROBE_DEFER; + return irq ?: -ENXIO; } ret = devm_request_irq(&pdev->dev, irq, act8945a_status_changed, diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index f7059459f0fb..e8065af085bd 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -60,8 +60,8 @@ enum { #define BATTERY_MODE_OFFSET 0x03 #define BATTERY_MODE_MASK 0x8000 enum sbs_battery_mode { - BATTERY_MODE_AMPS, - BATTERY_MODE_WATTS + BATTERY_MODE_AMPS = 0, + BATTERY_MODE_WATTS = 0x8000 }; /* manufacturer access defines */ |