| commit | d6e7f0bdbeda375efe5d481b217b88f2c64dfe72 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sat Jul 20 00:11:28 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat Jul 20 00:11:27 2013 -0700 |
| tree | 3981033f895e82cbf59436fa3916a094c0fd1370 | |
| parent | 6f8e6e3cf0d640dd91331cbe26cb5d259653c568 [diff] | |
| parent | faa58e54a885fa76247f153ca611a96ee7ed8bf0 [diff] |
Merge "msm: pil-q6v5-mss: Correct kzalloc return path checking"
diff --git a/arch/arm/mach-msm/pil-q6v5-mss.c b/arch/arm/mach-msm/pil-q6v5-mss.c index 56047ff..c267541 100644 --- a/arch/arm/mach-msm/pil-q6v5-mss.c +++ b/arch/arm/mach-msm/pil-q6v5-mss.c
@@ -299,8 +299,8 @@ int ret; mba = devm_kzalloc(&pdev->dev, sizeof(*mba), GFP_KERNEL); - if (IS_ERR(mba)) - return PTR_ERR(mba); + if (!mba) + return -ENOMEM; drv->mba = mba; q6 = pil_q6v5_init(pdev);