diff --git a/[refs] b/[refs] index 64993871e6b1..1ff6909fe401 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f3f254f7c138a22a544b80ce2c14a3fc4ed711e +refs/heads/master: 38c602b8ed4ddb73c9274df1af33a6f6f7db26e1 diff --git a/trunk/drivers/media/platform/exynos4-is/fimc-core.c b/trunk/drivers/media/platform/exynos4-is/fimc-core.c index f25807d7bc8a..a8eaad0fc612 100644 --- a/trunk/drivers/media/platform/exynos4-is/fimc-core.c +++ b/trunk/drivers/media/platform/exynos4-is/fimc-core.c @@ -955,8 +955,8 @@ static int fimc_probe(struct platform_device *pdev) } if (!fimc->drv_data || fimc->id >= fimc->drv_data->num_entities || fimc->id < 0) { - dev_err(dev, "Invalid driver data or device id (%d/%d)\n", - fimc->id, fimc->drv_data->num_entities); + dev_err(dev, "Invalid driver data or device id (%d)\n", + fimc->id); return -EINVAL; } if (!dev->of_node)