From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Baryshkov Subject: Re: [PATCH 1/6] Core driver for WM97xx touchscreens Date: Sat, 26 Jan 2008 10:18:16 +0000 (UTC) Message-ID: References: <20080121152402.GA7518@rakim.wolfsonmicro.main> <1200929100-17224-1-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: linux-input@vger.kernel.org List-Id: linux-input@vger.kernel.org Hi, Please apply this patch. BTW: Could you please also add me to the "CC" list of this patch serie? >>From 1e61dd8a8c8346f925f09cae34275c9754bf2be1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 26 Jan 2008 13:04:29 +0300 Subject: [PATCH] Fix wm97xx_resume Signed-off-by: Dmitry Baryshkov --- drivers/input/touchscreen/wm97xx-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 06030a8..27a0a99 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c @@ -639,7 +639,7 @@ static int wm97xx_remove(struct device *dev) } #ifdef CONFIG_PM -int wm97xx_resume(struct device *dev) +static int wm97xx_resume(struct device *dev) { struct wm97xx *wm = dev_get_drvdata(dev); @@ -647,7 +647,7 @@ int wm97xx_resume(struct device *dev) if (wm->id == WM9713_ID2) { wm97xx_reg_write(wm, AC97_WM9713_DIG1, wm->dig[0]); wm97xx_reg_write(wm, 0x5a, wm->misc); - if (wm->ts_use_count) { + if (wm->input_dev->users) { u16 reg; reg = wm97xx_reg_read(wm, AC97_EXTENDED_MID) & 0x7fff; wm97xx_reg_write(wm, AC97_EXTENDED_MID, reg); -- 1.5.3.8 -- With best wishes Dmitry