---

yaml --- r: 357325 b: refs/heads/master c: ef89fff h: refs/heads/master i: 357323: fec8e23 v: v3
git-mirror · Jan 6, 2013 · e665cff · e665cff
1 parent e0d2afd
commit e665cff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e731e443fcc8e4553201ad0573c1d5571e906ac
+refs/heads/master: ef89fff874758c0f08501bdc2932b7e77421cfc6
diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1135,12 +1135,12 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 	}
 
 	dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l);
-	if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) {
+	if (IS_ERR(dev->alloc_ctx[0])) {
 		ret = PTR_ERR(dev->alloc_ctx[0]);
 		goto err_res;
 	}
 	dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r);
-	if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) {
+	if (IS_ERR(dev->alloc_ctx[1])) {
 		ret = PTR_ERR(dev->alloc_ctx[1]);
 		goto err_mem_init_ctx_1;
 	}