diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 15:26:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 15:26:16 +0100 |
| commit | 64b9175055a6a4dd367f92cb2be097fbb8013cb0 (patch) | |
| tree | 93a4d36410894832885fde2820db75ebb0aacba4 | |
| parent | 35edcf68a999028d12ef3203e1227d6b8dd650a1 (diff) | |
| parent | 95915ba4b987cf2b222b0f251280228a1ff977ac (diff) | |
| download | percpu-64b9175055a6a4dd367f92cb2be097fbb8013cb0.tar.gz | |
Merge tag 'optee-fix-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes
Fix kernel panic in OP-TEE driver
* tag 'optee-fix-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee:
tee: optee: Fix kernel panic caused by incorrect error handling
Link: https://lore.kernel.org/r/20240304132727.GA3501807@rayden
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/tee/optee/device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c index 4b10921276942e..1892e49a8e6a68 100644 --- a/drivers/tee/optee/device.c +++ b/drivers/tee/optee/device.c @@ -90,13 +90,14 @@ static int optee_register_device(const uuid_t *device_uuid, u32 func) if (rc) { pr_err("device registration failed, err: %d\n", rc); put_device(&optee_device->dev); + return rc; } if (func == PTA_CMD_GET_DEVICES_SUPP) device_create_file(&optee_device->dev, &dev_attr_need_supplicant); - return rc; + return 0; } static int __optee_enumerate_devices(u32 func) |