From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/drivers/soc/rockchip/rockchip-cpuinfo.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c b/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c index 5785d42..02befb1 100644 --- a/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c +++ b/kernel/drivers/soc/rockchip/rockchip-cpuinfo.c @@ -57,12 +57,9 @@ } cell = nvmem_cell_get(dev, "id"); - if (IS_ERR(cell)) { - dev_err(dev, "failed to get id cell: %ld\n", PTR_ERR(cell)); - if (PTR_ERR(cell) == -EPROBE_DEFER) - return PTR_ERR(cell); - return PTR_ERR(cell); - } + if (IS_ERR(cell)) + return dev_err_probe(dev, PTR_ERR(cell), "failed to get id cell\n"); + efuse_buf = nvmem_cell_read(cell, &len); nvmem_cell_put(cell); if (IS_ERR(efuse_buf)) -- Gitblit v1.6.2