Commit 6fb605c4 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'at24-updates-for-v6.5' of... 

Merge tag 'at24-updates-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-mergewindow

at24 updates for v6.5

- use dev_err_probe() where applicable
parents 8a86133e a3c10035

drivers/misc/eeprom/at24.c

+2 −1
Original line number Diff line number Diff line
@@ -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");

	}



	/*