* Stephen Warren wrote:
[...]
> @@ -636,7 +649,18 @@ static int tegra_i2c_probe(struct platform_device *pdev)
>                       i2c_dev->bus_clk_rate = be32_to_cpup(prop);
>       }
>  
> -     if (pdev->id == 3)
> +#if defined(CONFIG_OF)
> +     if (pdev->dev.of_node) {
> +             const struct of_device_id *match;
> +
> +             match = of_match_device(tegra_i2c_of_match, &pdev->dev);
> +             if (!match)
> +                     return -EINVAL;
> +
> +             i2c_dev->is_dvc = match->data;
> +     }
> +#endif
> +     else if (pdev->id == 3)

Shouldn't the "else" move into the CONFIG_OF branch?

Thierry

Attachment: pgpiyYEWbCjMi.pgp
Description: PGP signature

Reply via email to