diff options
| author | Dan Murphy <DMurphy@ti.com> | 2014-11-20 12:42:13 -0600 |
|---|---|---|
| committer | Dan Murphy <DMurphy@ti.com> | 2014-11-20 12:42:13 -0600 |
| commit | edf440498b121b8ad99601c1a5737369057b973f (patch) | |
| tree | 9996f0b3717023237a8edcf2139ba14dd7d00bfd /drivers/power | |
| parent | ae7e16752ba952afa5dbeb472c54c501fbabef7d (diff) | |
| parent | 9c3da88145da7cd96bb898bc0304d3f783d4c8b2 (diff) | |
Merge tag 'v3.14.24' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y
This is the 3.14.24 stable release
* tag 'v3.14.24' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (204 commits)
Linux 3.14.24
mm: page_alloc: fix zone allocation fairness on UP
Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
of: Fix overflow bug in string property parsing functions
sysfs: driver core: Fix glue dir race condition by gdp_mutex
i2c: at91: don't account as iowait
regulator: max77693: Fix use of uninitialized regulator config
powerpc: use device_online/offline() instead of cpu_up/down()
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80
rbd: Fix error recovery in rbd_obj_read_sync()
drm/radeon: remove invalid pci id
drm/radeon/dpm: disable ulv support on SI
drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
sched: Use rq->rd in sched_setaffinity() under RCU read lock
usb: gadget: f_fs: remove redundant ffs_data_get()
usb: gadget: udc: core: fix kernel oops with soft-connect
usb: gadget: function: acm: make f_acm pass USB20CV Chapter9
usb: dwc3: gadget: fix set_halt() bug with pending transfers
crypto: algif - avoid excessive use of socket buffer in skcipher
...
Conflicts:
drivers/gpu/drm/tilcdc/tilcdc_drv.c
drivers/usb/dwc3/gadget.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/charger-manager.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 9e4dab46eef..ef1f4c92843 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -1720,6 +1720,11 @@ static int charger_manager_probe(struct platform_device *pdev) return -EINVAL; } + if (!desc->psy_fuel_gauge) { + dev_err(&pdev->dev, "No fuel gauge power supply defined\n"); + return -EINVAL; + } + /* Counting index only */ while (desc->psy_charger_stat[i]) i++; |