Commit d4e2385c authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

Merge branch 'fixes' into for-next 



Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parents 10e48b7d 648b8eba

drivers/power/supply/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/power/supply/act8945a_charger.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/power/supply/sbs-battery.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */