Revert "nvmem: core: fix return value"

This reverts commit e953810345 which is
commit 0c4862b1c1465e473bc961a02765490578bf5c20 upstream.

It breaks the Android kernel api, and isn't even really needed in the
5.10.y kernel tree yet, as there are no users of the new field.  So
revert it for now.  If it is needed, it can be brought back in an
abi-safe way in the future.

Bug: 161946584
Change-Id: I4e335c73a46ba291c790e54f40350a754ff6376b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-03-03 12:46:48 +00:00
parent 0caf8151c2
commit 365c551e77

View File

@ -638,7 +638,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
GPIOD_OUT_HIGH);
if (IS_ERR(nvmem->wp_gpio)) {
rval = PTR_ERR(nvmem->wp_gpio);
nvmem->wp_gpio = NULL;
goto err_put_device;
}