Merge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next

This commit is contained in:
Mark Brown 2013-10-24 11:11:41 +01:00
Родитель 07afa93e31 4932e89d75
Коммит 6c7bdf8e63
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -137,7 +137,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
/* This instance is not set for regulator mode so bail out */ /* This instance is not set for regulator mode so bail out */
if (pdata->mode != TPS6105X_MODE_VOLTAGE) { if (pdata->mode != TPS6105X_MODE_VOLTAGE) {
dev_info(&pdev->dev, dev_info(&pdev->dev,
"chip not in voltage mode mode, exit probe \n"); "chip not in voltage mode mode, exit probe\n");
return 0; return 0;
} }