From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756725AbaEIOSs (ORCPT ); Fri, 9 May 2014 10:18:48 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:41079 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751809AbaEIOSr (ORCPT ); Fri, 9 May 2014 10:18:47 -0400 Date: Fri, 9 May 2014 15:18:40 +0100 From: Lee Jones To: Alexander Shiyan Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Samuel Ortiz , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: Re: [PATCH 1/2] mfd: mc13xxx: Do not use platform data with devicetree Message-ID: <20140509141840.GZ5767@lee--X1> References: <1398926883-21778-1-git-send-email-shc_work@mail.ru> <20140509113030.GV5767@lee--X1> <1399643769.716496780@f345.i.mail.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1399643769.716496780@f345.i.mail.ru> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 09 May 2014, Alexander Shiyan wrote: > Fri, 9 May 2014 12:30:30 +0100 от Lee Jones : > > > 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 > > > --- > > > 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