power: supply: charger-manager: Verify polling interval only when polling requested

Driver bails out with -EINVAL when no polling specififaion is requested.
Fix that by verifing polling interval only if polling_mode is different
from CM_POLL_DISABLE.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 1de4b44..2a50b46 100644 (file)
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1700,8 +1700,9 @@ static int charger_manager_probe(struct platform_device *pdev)
                power_supply_put(psy);
        }
 
-       if (desc->polling_interval_ms == 0 ||
-           msecs_to_jiffies(desc->polling_interval_ms) <= CM_JIFFIES_SMALL) {
+       if (cm->desc->polling_mode != CM_POLL_DISABLE &&
+           (desc->polling_interval_ms == 0 ||
+            msecs_to_jiffies(desc->polling_interval_ms) <= CM_JIFFIES_SMALL)) {
                dev_err(&pdev->dev, "polling_interval_ms is too small\n");
                return -EINVAL;
        }