Hi,
On Thu, Apr 09, 2015 at 09:34:00AM +0200, Hans Verkuil wrote:
...
> >>> --- a/drivers/media/i2c/adp1653.c
> >>> +++ b/drivers/media/i2c/adp1653.c
> >>> @@ -306,9 +309,17 @@ adp1653_init_device(struct adp1653_flash *flash)
> >>> static int
> >>> __adp1653_set_power(struct adp1653_flash *flash, int on)
> >>> {
> >>> - int ret;
> >>> + int ret = 0;
> >>> +
> >>> + if (flash->platform_data->power) {
> >>> + ret = flash->platform_data->power(&flash->subdev, on);
> >>> + } else {
> >>> + gpio_set_value(flash->platform_data->power_gpio, on);
> >>
> >> The power_gpio field is not found in struct adp1653_platform_data.
> >
> > Yes, int power_gpio should be added into that struct.
> >
> >> Can you fix this?
> >>
> >> I'm also getting this warning:
> >
> > Well, old version of patch was merged while new versions were getting
> > discussed / developed in another mail thread.
> >
> > I guess best course of action is to drop this from Mauro's tree, as
> > conflicting patch exists in Sakari's tree...?
>
> Sakari, do you agree? How did this patch manage to be merged? Was it not
> marked Superseded?
I don't know why that was merged. The patch is an old version of the adp1653
DT support patch, which was agreed to split into two: DT binding
documentation and the driver changes. As Pavel said, the DT documentation
patch is in my tree.
Mauro, could you revert it, please?
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@xxxxxx XMPP: sailus@xxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
