commit a5ea3a921763e7bb3059116e67635daa2a5d77ca
author Ankit Premrajka <ankitp@codeaurora.org> Thu Aug 04 17:54:17 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 10:28:49 2011 -0700
tree 4afceb58dc3777da094b3aa45e76a36d270acb99
parent e9bf86a15e2218a7a71820c6f670dfd034cb54bb

msm: camera: correct error checking in case of failed allocation.

Signed-off-by: Ankit Premrajka <ankitp@codeaurora.org>

drivers/media/video/videobuf-msm-mem.c

diff --git a/drivers/media/video/videobuf-msm-mem.c b/drivers/media/video/videobuf-msm-mem.c
index 13265bf..5646f9f 100644
--- a/drivers/media/video/videobuf-msm-mem.c
+++ b/drivers/media/video/videobuf-msm-mem.c
@@ -284,7 +284,7 @@
 	buf->bsize = mem->size;
 	mem->phyaddr = msm_mem_allocate(mem->size);
 
-	if (IS_ERR((void *)mem->phyaddr)) {
+	if (!mem->phyaddr) {
 		pr_err("%s : pmem memory allocation failed\n", __func__);
 		goto error;
 	}

drivers/media/video/videobuf2-msm-mem.c

diff --git a/drivers/media/video/videobuf2-msm-mem.c b/drivers/media/video/videobuf2-msm-mem.c
index 4159056..388dca2 100644
--- a/drivers/media/video/videobuf2-msm-mem.c
+++ b/drivers/media/video/videobuf2-msm-mem.c
@@ -93,7 +93,7 @@
 	mem->alloc_ctx = alloc_ctx;
 	mem->is_userptr = 0;
 	mem->phyaddr = msm_mem_allocate(mem->size);
-	if (IS_ERR((void *)mem->phyaddr)) {
+	if (!mem->phyaddr) {
 		pr_err("%s : pmem memory allocation failed\n", __func__);
 		kfree(mem);
 		return ERR_PTR(-ENOMEM);