Skip to content

Commit 74ad47c

Browse files
committed
regulator: Merge up forgotten fix
I forgot to send this fix during the 6.1 cycle, make sure it gets sent for 6.2.
2 parents 1b929c0 + 02228f6 commit 74ad47c

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/regulator/da9211-regulator.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,12 @@ static int da9211_i2c_probe(struct i2c_client *i2c)
498498

499499
chip->chip_irq = i2c->irq;
500500

501+
ret = da9211_regulator_init(chip);
502+
if (ret < 0) {
503+
dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret);
504+
return ret;
505+
}
506+
501507
if (chip->chip_irq != 0) {
502508
ret = devm_request_threaded_irq(chip->dev, chip->chip_irq, NULL,
503509
da9211_irq_handler,
@@ -512,11 +518,6 @@ static int da9211_i2c_probe(struct i2c_client *i2c)
512518
dev_warn(chip->dev, "No IRQ configured\n");
513519
}
514520

515-
ret = da9211_regulator_init(chip);
516-
517-
if (ret < 0)
518-
dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret);
519-
520521
return ret;
521522
}
522523

0 commit comments

Comments
 (0)