diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-06-28 13:36:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-06-28 13:36:22 +0200 |
commit | accaf69da1d1e64bd77ac0caad77e4cfc3b654c7 (patch) | |
tree | 0402e4fad9cecd428c8c3c228a08f9e31eb63470 /drivers/media/platform/exynos4-is/mipi-csis.c | |
parent | ALSA: Replace the magic number 44 with const (diff) | |
parent | Merge remote-tracking branch 'asoc/topic/x86' into asoc-next (diff) | |
download | linux-accaf69da1d1e64bd77ac0caad77e4cfc3b654c7.tar.xz linux-accaf69da1d1e64bd77ac0caad77e4cfc3b654c7.zip |
Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.11
Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.
Diffstat (limited to 'drivers/media/platform/exynos4-is/mipi-csis.c')
-rw-r--r-- | drivers/media/platform/exynos4-is/mipi-csis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c index a2eda9d5ac87..254d70fe762a 100644 --- a/drivers/media/platform/exynos4-is/mipi-csis.c +++ b/drivers/media/platform/exynos4-is/mipi-csis.c @@ -746,7 +746,7 @@ static int s5pcsis_parse_dt(struct platform_device *pdev, node = v4l2_of_get_next_endpoint(node, NULL); if (!node) { dev_err(&pdev->dev, "No port node at %s\n", - node->full_name); + pdev->dev.of_node->full_name); return -EINVAL; } /* Get port node and validate MIPI-CSI channel id. */ |