projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' into next
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
exynos4-is
/
media-dev.c
diff --git
a/drivers/media/platform/exynos4-is/media-dev.c
b/drivers/media/platform/exynos4-is/media-dev.c
index feb521f28e14857b8344d7320769c87183cd17ac..4f494acd8150fd85f8aaedfb3572b85bb22b460d 100644
(file)
--- a/
drivers/media/platform/exynos4-is/media-dev.c
+++ b/
drivers/media/platform/exynos4-is/media-dev.c
@@
-1446,22
+1446,13
@@
static int fimc_md_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, fmd);
platform_set_drvdata(pdev, fmd);
- /* Protect the media graph while we're registering entities */
- mutex_lock(&fmd->media_dev.graph_mutex);
-
ret = fimc_md_register_platform_entities(fmd, dev->of_node);
ret = fimc_md_register_platform_entities(fmd, dev->of_node);
- if (ret) {
- mutex_unlock(&fmd->media_dev.graph_mutex);
+ if (ret)
goto err_clk;
goto err_clk;
- }
ret = fimc_md_register_sensor_entities(fmd);
ret = fimc_md_register_sensor_entities(fmd);
- if (ret) {
- mutex_unlock(&fmd->media_dev.graph_mutex);
+ if (ret)
goto err_m_ent;
goto err_m_ent;
- }
-
- mutex_unlock(&fmd->media_dev.graph_mutex);
ret = device_create_file(&pdev->dev, &dev_attr_subdev_conf_mode);
if (ret)
ret = device_create_file(&pdev->dev, &dev_attr_subdev_conf_mode);
if (ret)
This page took
0.047001 seconds
and
5
git commands to generate.