From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099AbaEIN4h (ORCPT ); Fri, 9 May 2014 09:56:37 -0400 Received: from fallback4.mail.ru ([94.100.176.42]:33292 "EHLO fallback4.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753305AbaEIN4f (ORCPT ); Fri, 9 May 2014 09:56:35 -0400 From: =?UTF-8?B?QWxleGFuZGVyIFNoaXlhbg==?= To: =?UTF-8?B?TGVlIEpvbmVz?= Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, =?UTF-8?B?U2FtdWVsIE9ydGl6?= , =?UTF-8?B?TGlhbSBHaXJkd29vZA==?= , =?UTF-8?B?TWFyayBCcm93bg==?= , =?UTF-8?B?SmFyb3NsYXYgS3lzZWxh?= , =?UTF-8?B?VGFrYXNoaSBJd2Fp?= Subject: =?UTF-8?B?UmU6IFtQQVRDSCAxLzJdIG1mZDogbWMxM3h4eDogRG8gbm90IHVzZSBwbGF0?= =?UTF-8?B?Zm9ybSBkYXRhIHdpdGggZGV2aWNldHJlZQ==?= Mime-Version: 1.0 X-Mailer: Mail.Ru Mailer 1.0 X-Originating-IP: [5.18.98.0] Date: Fri, 09 May 2014 17:56:09 +0400 Reply-To: =?UTF-8?B?QWxleGFuZGVyIFNoaXlhbg==?= X-Priority: 3 (Normal) Message-ID: <1399643769.716496780@f345.i.mail.ru> Content-Type: text/plain; charset=utf-8 X-Mras: Ok X-Spam: undefined In-Reply-To: <20140509113030.GV5767@lee--X1> References: <1398926883-21778-1-git-send-email-shc_work@mail.ru> <20140509113030.GV5767@lee--X1> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id s49DufpJ003515 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. --- {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I