Merge git://git.infradead.org/users/cbou/battery-2.6.33 (06a57f4f) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/wm97xx_battery.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -175,7 +175,13 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
		dev_err(&dev->dev, "Do not pass platform_data through "
		"wm97xx_bat_set_pdata!\n");
		return -EINVAL;
		} else
		}

		if (!wmdata) {
		dev_err(&dev->dev, "No platform data supplied\n");
		return -EINVAL;
		}

		pdata = wmdata->batt_pdata;

		if (dev->id != -1)