From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756531Ab0IWToH (ORCPT ); Thu, 23 Sep 2010 15:44:07 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:34230 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756280Ab0IWToF (ORCPT ); Thu, 23 Sep 2010 15:44:05 -0400 Date: Thu, 23 Sep 2010 12:43:13 -0700 From: Andrew Morton To: Takashi Iwai Cc: Samu Onkalo , =?ISO-8859-1?Q?=C9ric?= Piel , Guenter Roeck , linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org Subject: Re: [PATCH v2] lis3: Add support for new LIS3DC / HP3DC chip Message-Id: <20100923124313.7794e8f6.akpm@linux-foundation.org> In-Reply-To: References: X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.9; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 23 Sep 2010 08:01:31 +0200 Takashi Iwai wrote: > A new version of LIS3 chip has slight incompatibilities from former > versions. This patch adds the minimal support for it. > > Signed-off-by: Takashi Iwai > --- > v1->v2 > Rebased to patch "lis3: Fix Oops with NULL platform data (v2)" > Wait. I did my own rebasing and came up with a different patch, with two extra hunks: @@ -301,8 +311,9 @@ static irqreturn_t lis302dl_interrupt(in wake_up_interruptible(&lis3_dev.misc_wait); kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN); out: - if (lis3_dev.pdata && lis3_dev.whoami == WAI_8B && lis3_dev.idev && - lis3_dev.idev->input->users) + if (lis3_dev.pdata && + (lis3_dev.whoami == WAI_8B || lis3_dev.whoami == WAI_3DC) && + lis3_dev.idev && lis3_dev.idev->input->users) return IRQ_WAKE_THREAD; return IRQ_HANDLED; } and @@ -742,7 +762,7 @@ int lis3lv02d_init_device(struct lis3lv0 * io-apic is not configurable (and generates a warning) but I keep it * in case of support for other hardware. */ - if (dev->pdata && dev->whoami == WAI_8B) + if (dev->pdata && (dev->whoami == WAI_8B || dev->whoami == WAI_3DC)) thread_fn = lis302dl_interrupt_thread1_8b; else thread_fn = NULL; Did you drop those changes deliberately?