aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-01-06 08:22:34 -0500
committerLi Yang <leoyang.li@nxp.com>2018-01-22 17:59:48 -0500
commit14b055f43915a81be46d7e98f6f237bee62c6b0c (patch)
treef388e92cf85e23a59ae65086d62f65c814e961db
parent6ea0acfd0724007be4e368aca9dc29e384bf2330 (diff)
soc: fsl: guts: Add a NULL check for devm_kasprintf()
devm_kasprintf() may fail, so we should better add a NULL check and propagate an error on failure. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by: Li Yang <leoyang.li@nxp.com>
-rw-r--r--drivers/soc/fsl/guts.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index d98de2c76659..302e0c8d69d9 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -167,10 +167,16 @@ static int fsl_guts_probe(struct platform_device *pdev)
167 } else { 167 } else {
168 soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ"); 168 soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");
169 } 169 }
170 if (!soc_dev_attr.family)
171 return -ENOMEM;
170 soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL, 172 soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,
171 "svr:0x%08x", svr); 173 "svr:0x%08x", svr);
174 if (!soc_dev_attr.soc_id)
175 return -ENOMEM;
172 soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d", 176 soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
173 (svr >> 4) & 0xf, svr & 0xf); 177 (svr >> 4) & 0xf, svr & 0xf);
178 if (!soc_dev_attr.revision)
179 return -ENOMEM;
174 180
175 soc_dev = soc_device_register(&soc_dev_attr); 181 soc_dev = soc_device_register(&soc_dev_attr);
176 if (IS_ERR(soc_dev)) 182 if (IS_ERR(soc_dev))