summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorTom Zanussi <zanussi@kernel.org>2020-03-06 10:51:17 -0600
committerTom Zanussi <zanussi@kernel.org>2020-03-06 10:51:17 -0600
commita38cc65c6c1fd5aa312d0c1514e76246b236b515 (patch)
tree20b7c6fa153bbd7253d4283c53c2c600800d6353 /arch/mips
parentb404ad02d656d941a018b0361991e5b24fa294a6 (diff)
parent78d697fc93f98054e36a3ab76dca1a88802ba7be (diff)
downloadlinux-rt-a38cc65c6c1fd5aa312d0c1514e76246b236b515.tar.gz
Merge tag 'v4.14.172' into v4.14-rt-work
This is the 4.14.172 stable release
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/loongson64/loongson-3/platform.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/loongson64/loongson-3/platform.c b/arch/mips/loongson64/loongson-3/platform.c
index 25a97cc0ee33..0db4cc3196eb 100644
--- a/arch/mips/loongson64/loongson-3/platform.c
+++ b/arch/mips/loongson64/loongson-3/platform.c
@@ -31,6 +31,9 @@ static int __init loongson3_platform_init(void)
continue;
pdev = kzalloc(sizeof(struct platform_device), GFP_KERNEL);
+ if (!pdev)
+ return -ENOMEM;
+
pdev->name = loongson_sysconf.sensors[i].name;
pdev->id = loongson_sysconf.sensors[i].id;
pdev->dev.platform_data = &loongson_sysconf.sensors[i];