From a699c4f23852bad780b8ad5273d5a3171cd461f9 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 16 Jan 2015 10:50:41 +0100 Subject: apalis_t30: fix soc-camera-pdrv warning Commit fe4c58c4b96a24aba8e27956e8158b3002723b17 adding ADV7280 support introduced the following warning being printed during boot: [ 1.121072] sysfs: cannot create duplicate filename '/devices/platform/soc-camera-pdrv.3' --- arch/arm/mach-tegra/board-apalis_t30.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c index 4d25e3df9b75..1f3f84ad132f 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.c +++ b/arch/arm/mach-tegra/board-apalis_t30.c @@ -194,7 +194,7 @@ static struct soc_camera_link iclink_adv7280 = { static struct platform_device soc_camera_adv7280 = { .name = "soc-camera-pdrv", - .id = 3, + .id = 2, .dev = { .platform_data = &iclink_adv7280, }, @@ -226,7 +226,7 @@ static struct soc_camera_link iclink_tvp5150soc = { static struct platform_device soc_camera_tvp5150soc = { .name = "soc-camera-pdrv", - .id = 2, + .id = 3, .dev = { .platform_data = &iclink_tvp5150soc, }, @@ -258,7 +258,7 @@ static struct soc_camera_link iclink_ov7670soc = { static struct platform_device soc_camera_ov7670soc = { .name = "soc-camera-pdrv", - .id = 3, + .id = 4, .dev = { .platform_data = &iclink_ov7670soc, }, @@ -296,7 +296,7 @@ static struct soc_camera_link iclink_as0260soc = { static struct platform_device soc_camera_as0260soc = { .name = "soc-camera-pdrv", - .id = 4, + .id = 5, .dev = { .platform_data = &iclink_as0260soc, }, -- cgit v1.2.3