Skip to content

Commit

Permalink
Merge tag 'at24-updates-for-v6.5' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/kernel/git/brgl/linux into i2c/for-mergewindow

at24 updates for v6.5

- use dev_err_probe() where applicable
  • Loading branch information
Wolfram Sang committed Jun 23, 2023
2 parents 8a86133 + a3c1003 commit 6fb605c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/misc/eeprom/at24.c
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,8 @@ static int at24_probe(struct i2c_client *client)
pm_runtime_disable(dev);
if (!pm_runtime_status_suspended(dev))
regulator_disable(at24->vcc_reg);
return PTR_ERR(at24->nvmem);
return dev_err_probe(dev, PTR_ERR(at24->nvmem),
"failed to register nvmem\n");
}

/*
Expand Down

0 comments on commit 6fb605c

Please sign in to comment.