Re: [alsa-devel] [PATCH 1/2] mfd: mc13xxx: Do not use platform data with devicetree
On Fri, 09 May 2014, Alexander Shiyan wrote:
Fri, 9 May 2014 12:30:30 +0100 от Lee Jones lee.jones@linaro.org:
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@mail.ru
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=...
So, it should produce conflict.
Exactly.
Mark,
You need to revert (or remove) the original one and apply:
"ASoC: mc13783: Add devicetree support"
... instead.
On Fri, May 09, 2014 at 03:18:40PM +0100, Lee Jones wrote:
You need to revert (or remove) the original one and apply:
"ASoC: mc13783: Add devicetree support"
... instead.
Why not just pull the tag instead? I haven't looked at the patch but don't they need to go in together anyway.
You need to revert (or remove) the original one and apply:
"ASoC: mc13783: Add devicetree support"
... instead.
Why not just pull the tag instead? I haven't looked at the patch but don't they need to go in together anyway.
Only functionally. They are orthogonally buildable apparently.
On Fri, May 09, 2014 at 03:36:29PM +0100, Lee Jones wrote:
Why not just pull the tag instead? I haven't looked at the patch but don't they need to go in together anyway.
Only functionally. They are orthogonally buildable apparently.
Working code seems important to bisection too...
participants (2)
-
Lee Jones -
Mark Brown