From patchwork Fri Apr 13 22:36:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stigge@antcom.de X-Patchwork-Id: 152417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-lb0-f184.google.com (mail-lb0-f184.google.com [209.85.217.184]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 398AEB7014 for ; Sat, 14 Apr 2012 08:36:56 +1000 (EST) Received: by lbbgf7 with SMTP id gf7sf1614757lbb.11 for ; Fri, 13 Apr 2012 15:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-feas-system-wl :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=UkU/45526Ip17Hla4lvx6+lDwLKCBiwu6EcT31DrJx0=; b=Kt9faXUmfNlAahTMNlpwB0ehd5g7NC4KtS7lQo1QMfM3AZU6GFjTWLbT5VLZ1kWZyr Ea4mbRRsmjBLOh2m7l7s48f2KP3fDJOqK18nxyHU86Kv0N9221n0h27IcZqRLcsaTCXs mnorhKCXPAKod3m64mW1eBR8cwjXg54JFGWT0= Received: by 10.180.80.97 with SMTP id q1mr522088wix.3.1334356611011; Fri, 13 Apr 2012 15:36:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.216.199.199 with SMTP id x49ls5087932wen.1.gmail; Fri, 13 Apr 2012 15:36:50 -0700 (PDT) Received: by 10.180.87.165 with SMTP id az5mr648933wib.4.1334356610544; Fri, 13 Apr 2012 15:36:50 -0700 (PDT) Received: by 10.180.87.165 with SMTP id az5mr648932wib.4.1334356610529; Fri, 13 Apr 2012 15:36:50 -0700 (PDT) Received: from work-microwave.de (mail.work-microwave.de. [62.245.205.51]) by gmr-mx.google.com with ESMTPS id ca1si1398209wib.1.2012.04.13.15.36.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Apr 2012 15:36:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of rst@work-microwave.de designates 62.245.205.51 as permitted sender) client-ip=62.245.205.51; Received: from rst-pc1.lan.work-microwave.de ([192.168.11.78]) (authenticated bits=0) by mail.work-microwave.de with ESMTP id q3DMalXU005030 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Apr 2012 23:36:48 +0100 Received: by rst-pc1.lan.work-microwave.de (Postfix, from userid 1000) id E179BAE074; Sat, 14 Apr 2012 00:36:47 +0200 (CEST) From: Roland Stigge To: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, w.sang@pengutronix.de, srinivas.bakki@nxp.com, kevin.wells@nxp.com, gregkh@linuxfoundation.org, netdev@vger.kernel.org, rtc-linux@googlegroups.com, a.zummo@towertech.it, linux-watchdog@vger.kernel.org, wim@iguana.be, jonsmirl@gmail.com Cc: Roland Stigge , stable@vger.kernel.org Subject: [rtc-linux] [PATCH RESEND v3 5/8] i2c-pnx.c: Fix suspend Date: Sat, 14 Apr 2012 00:36:36 +0200 Message-Id: <1334356600-20950-5-git-send-email-stigge@antcom.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1334356600-20950-1-git-send-email-stigge@antcom.de> References: <1334356600-20950-1-git-send-email-stigge@antcom.de> X-FEAS-SYSTEM-WL: rst@work-microwave.de, 192.168.11.78 X-Original-Sender: stigge@antcom.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of rst@work-microwave.de designates 62.245.205.51 as permitted sender) smtp.mail=rst@work-microwave.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , In the driver's suspend function, clk_enable() was used instead of clk_disable(). This is corrected with this patch. Signed-off-by: Roland Stigge Reviewed-by: Arnd Bergmann CC: stable@vger.kernel.org --- Applies to v3.4-rc2 drivers/i2c/busses/i2c-pnx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- linux-2.6.orig/drivers/i2c/busses/i2c-pnx.c +++ linux-2.6/drivers/i2c/busses/i2c-pnx.c @@ -546,8 +546,7 @@ static int i2c_pnx_controller_suspend(st { struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev); - /* FIXME: shouldn't this be clk_disable? */ - clk_enable(alg_data->clk); + clk_disable(alg_data->clk); return 0; }