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 | |
| parent | Merge tag 'samsung-drivers-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers (diff) | |
| parent | soc: samsung: exynos-chipid: Add NULL pointer check in exynos_chipid_probe() (diff) | |
| download | wireguard-linux-af6502eb6519460f3579a4c4aff2380d3ab6e5bd.tar.xz wireguard-linux-af6502eb6519460f3579a4c4aff2380d3ab6e5bd.zip | |
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>
| -rw-r--r-- | arch/arm/mach-s3c/devs.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c | 1 | ||||
| -rw-r--r-- | drivers/soc/samsung/exynos-chipid.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c index 8c26d592d2a3..bab2abd8a34a 100644 --- a/arch/arm/mach-s3c/devs.c +++ b/arch/arm/mach-s3c/devs.c @@ -19,7 +19,6 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/dma-mapping.h> -#include <linux/fb.h> #include <linux/gfp.h> #include <linux/mmc/host.h> #include <linux/ioport.h> diff --git a/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c b/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c index cfa34b55ca21..c3269cd6a848 100644 --- a/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c +++ b/arch/arm/mach-s3c/setup-fb-24bpp-s3c64xx.c @@ -9,7 +9,6 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/fb.h> #include <linux/gpio.h> #include "fb.h" diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index b5debd5ad994..c86f1058ceed 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"); |