From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 2 Apr 2014 06:21:53 +0000 (+0800)
Subject: bq24296_charger: fix probe failed bug, which cause resume panic
X-Git-Tag: firefly_0821_release~5642
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d93c580979f1a0147c718ada1fa1ce4028716ed8;p=firefly-linux-kernel-4.4.55.git

bq24296_charger: fix probe failed bug, which cause resume panic
---

diff --git a/drivers/power/bq24296_charger.c b/drivers/power/bq24296_charger.c
index 7312c87c06f9..9bdc35e8877c 100755
--- a/drivers/power/bq24296_charger.c
+++ b/drivers/power/bq24296_charger.c
@@ -523,7 +523,7 @@ static int bq24296_battery_probe(struct i2c_client *client,const struct i2c_devi
 	u8 retval = 0;
 	struct bq24296_board *pdev;
 	struct device_node *bq24296_node;
-	int ret=0;
+	int ret = -EINVAL;
 	
 	 DBG("%s,line=%d\n", __func__,__LINE__);
 	 
@@ -535,7 +535,7 @@ static int bq24296_battery_probe(struct i2c_client *client,const struct i2c_devi
 	di = devm_kzalloc(&client->dev,sizeof(*di), GFP_KERNEL);
 	if (!di) {
 		dev_err(&client->dev, "failed to allocate device info data\n");
-		retval = -ENOMEM;
+		ret = -ENOMEM;
 		goto batt_failed_2;
 	}
 	i2c_set_clientdata(client, di);
@@ -595,7 +595,7 @@ static int bq24296_battery_probe(struct i2c_client *client,const struct i2c_devi
 err_chgirq_failed:
 	free_irq(gpio_to_irq(pdev->chg_irq_pin), NULL);
 batt_failed_2:
-	return retval;
+	return ret;
 }
 
 static void bq24296_battery_shutdown(struct i2c_client *client)