Re: [PATCH 1/2] mfd: mc13xxx: Do not use platform data with devicetree

[Lee Jones]

On Fri, 09 May 2014, Alexander Shiyan wrote:

> Fri, 9 May 2014 12:30:30 +0100 ÐÑ Lee Jones <lee.jones@xxxxxxxxxx>:
> > > This patch removes platform data usage for codec and touchscreen
> > > when driver is used with devicetree.
> > > This fixes possible "null pointer dereference" error if DTS uses
> > > "fsl,mc13xxx-uses-codec" or "fsl,mc13xxx-uses-touch" options.
> > > 
> > > Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx>
> > > ---
> > >  drivers/mfd/mc13xxx-core.c | 18 ++++++++++--------
> > >  1 file changed, 10 insertions(+), 8 deletions(-)
> > 
> > Applied, thanks.
> 
> This patch has been written as a way to separate MFD and ASoC changes of
> the patch: (ASoC: mc13783: Add devicetree support)
> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=780aaeff96819ca58e0cad830bfbe6eee9aef82c
> 
> So, it should produce conflict.

Exactly.

Mark,

You need to revert (or remove) the original one and apply:

  "ASoC: mc13783: Add devicetree support"

... instead.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/