| commit | 141ae953ca1633860eccae3f459aa26d7b4fb4c9 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Nov 06 08:14:26 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Nov 06 08:14:25 2013 -0800 |
| tree | 40708e5e8f2de86f025fb5acd924a7f573b4d757 | |
| parent | a0da9f24d4e5f8f97c6dc39a7ae8e4ebebfdf45e [diff] | |
| parent | 318cac4615acf350fcd7173591e20682e668a7e4 [diff] |
Merge "slim_ngd: Add NULL pointer check apart from error check"
diff --git a/drivers/slimbus/slim-msm-ngd.c b/drivers/slimbus/slim-msm-ngd.c index 0c9959c..67cf049 100644 --- a/drivers/slimbus/slim-msm-ngd.c +++ b/drivers/slimbus/slim-msm-ngd.c
@@ -1065,7 +1065,7 @@ } dev = kzalloc(sizeof(struct msm_slim_ctrl), GFP_KERNEL); - if (IS_ERR(dev)) { + if (IS_ERR_OR_NULL(dev)) { dev_err(&pdev->dev, "no memory for MSM slimbus controller\n"); return PTR_ERR(dev); }