Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 367101
b: refs/heads/master
c: d68b44e
h: refs/heads/master
i:
  367099: eb1fc3e
v: v3
  • Loading branch information
Wei Yongjun authored and Mauro Carvalho Chehab committed Apr 25, 2013
1 parent 75b800b commit 662aff1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b34f51fad396484e2bc102dcf95807b9990c3265
refs/heads/master: d68b44e088caf0176cf80e7539750569d6e71ed8
3 changes: 2 additions & 1 deletion trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,8 @@ static int s5p_mfc_probe(struct platform_device *pdev)
}

if (pdev->dev.of_node) {
if (s5p_mfc_alloc_memdevs(dev) < 0)
ret = s5p_mfc_alloc_memdevs(dev);
if (ret < 0)
goto err_res;
} else {
dev->mem_dev_l = device_find_child(&dev->plat_dev->dev,
Expand Down

0 comments on commit 662aff1

Please sign in to comment.