diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 22:39:11 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 22:39:12 +0100 |
| commit | af6502eb6519460f3579a4c4aff2380d3ab6e5bd (patch) | |
| tree | 4d66f45b3b43cfe6f77f88436ced02afcbfe0f3f /drivers/soc | |
| parent | 7bb0db29a5b6c4a875e56df1912fcc06ffff9f32 (diff) | |
| parent | c8222ef6cf29dd7cad21643228f96535cc02b327 (diff) | |
| download | ath-af6502eb6519460f3579a4c4aff2380d3ab6e5bd.tar.gz | |
Merge tag 'samsung-soc-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers
Samsung mach/soc changes for v6.15
1. S3C: Drop linux/fb.h header.
2. Exynos ChipID: Check if memory allocation succeeded.
* tag 'samsung-soc-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
soc: samsung: exynos-chipid: Add NULL pointer check in exynos_chipid_probe()
ARM: s3c: Do not include <linux/fb.h>
Link: https://lore.kernel.org/r/20250309185601.10616-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/samsung/exynos-chipid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index b5debd5ad9947..c86f1058ceed7 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -137,6 +137,8 @@ static int exynos_chipid_probe(struct platform_device *pdev) soc_dev_attr->revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%x", soc_info.revision); + if (!soc_dev_attr->revision) + return -ENOMEM; soc_dev_attr->soc_id = product_id_to_soc_id(soc_info.product_id); if (!soc_dev_attr->soc_id) { pr_err("Unknown SoC\n"); |