From patchwork Wed Jan 20 23:51:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessandro Zummo X-Patchwork-Id: 43381 Return-Path: <3-ZZXSw0MCTMPojbbd-VddVaTidlTgiTRW.XigiR-aXcjmVddVaTVgdjeh.Rdb@listserv.bounces.google.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gx0-f196.google.com (mail-gx0-f196.google.com [209.85.217.196]) by ozlabs.org (Postfix) with ESMTP id C8916B7D21 for ; Thu, 21 Jan 2010 10:51:23 +1100 (EST) Received: by gxk20 with SMTP id 20sf15141515gxk.16 for ; Wed, 20 Jan 2010 15:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:x-beenthere:received:received:received :received:received-spf:received:subject:to:from:cc:date:message-id :in-reply-to:references:user-agent:mime-version:x-virus-scanned :x-virus-status:x-original-authentication-results:x-original-sender :reply-to:precedence:mailing-list:list-id:list-post:list-help :list-archive:x-thread-url:x-message-url:sender:list-unsubscribe :list-subscribe:content-type; bh=pPrm/GFse7xMs/Zx6hqD6aB0aS87cHXUOy3vNOOs7+4=; b=P1ZazDbW3RIyMr9KfABOAekwjN49qjYNG2WivvmUt5Tti7kLzLJ2wbkcblGk9aCqx7 P3H1P9a4p67EDxMRH4rJ16vGkG+iGJ2SLkUtr4zdm92TqEys2h5NTMSR3NXD6nfH5NKs jg7FD/0l702XhJzBmx7uSobyhWMh9HB3AbPnw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:subject:to:from:cc:date:message-id :in-reply-to:references:user-agent:mime-version:x-virus-scanned :x-virus-status:x-original-authentication-results:x-original-sender :reply-to:precedence:mailing-list:list-id:list-post:list-help :list-archive:x-thread-url:x-message-url:sender:list-unsubscribe :list-subscribe:content-type; b=uzzDJC3BfqDhggvTJbxd/zIbNz5agfmOjpQZPJDFJgMuj+QzXYPBjRDM1EQ/DrcWdt Wr0b3+r2ZxqiNQT9RIeov4h6YqVbX7h8slpV9WN/F41XDvHkHlJThBpaG37scd2kap7m IHi2T/mDfmnALbAdu45aAjtVUbMsFhyODKO68= Received: by 10.101.151.37 with SMTP id d37mr59797ano.3.1264031482026; Wed, 20 Jan 2010 15:51:22 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.204.13.214 with SMTP id d22ls179401bka.0.p; Wed, 20 Jan 2010 15:51:21 -0800 (PST) Received: by 10.204.32.132 with SMTP id c4mr21988bkd.34.1264031480965; Wed, 20 Jan 2010 15:51:20 -0800 (PST) Received: by 10.204.32.132 with SMTP id c4mr21986bkd.34.1264031480945; Wed, 20 Jan 2010 15:51:20 -0800 (PST) Received: from elettra.colt-to.towertech.it (elettra.colt-to.towertech.it [213.215.222.70]) by gmr-mx.google.com with ESMTP id 18si33250bwz.13.2010.01.20.15.51.20; Wed, 20 Jan 2010 15:51:20 -0800 (PST) Received-SPF: pass (google.com: domain of a.zummo@towertech.it designates 213.215.222.70 as permitted sender) client-ip=213.215.222.70; Received: from linux.lan.towertech.it (93-39-56-184.ip74.fastwebnet.it [93.39.56.184]) by elettra.colt-to.towertech.it (Postfix) with ESMTPA id 7D14C116727; Thu, 21 Jan 2010 00:51:20 +0100 (CET) Subject: [rtc-linux] [PATCH 2/6] rtc-fm3130: add missing braces To: akpm@linux-foundation.org From: Alessandro Zummo Cc: Sergey Lapin , Sergey Matyukevich , rtc-linux@googlegroups.com Date: Thu, 21 Jan 2010 00:51:20 +0100 Message-ID: <20100120235120.18737.16638.stgit@linux.lan.towertech.it> In-Reply-To: <20100120235113.18737.16187.stgit@linux.lan.towertech.it> References: <20100120235113.18737.16187.stgit@linux.lan.towertech.it> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.95.3 at elettra X-Virus-Status: Clean X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of a.zummo@towertech.it designates 213.215.222.70 as permitted sender) smtp.mail=a.zummo@towertech.it X-Original-Sender: azummo-google@towertech.it Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: X-Thread-Url: http://groups.google.com/group/rtc-linux/t/c7d57222362a7905 X-Message-Url: http://groups.google.com/group/rtc-linux/msg/135812b0e568365f Sender: rtc-linux@googlegroups.com List-Unsubscribe: , List-Subscribe: , From: Sergey Matyukevich Add missing braces for multiline 'if' statements in fm3130_probe. Signed-off-by: Sergey Matyukevich Signed-off-by: Alessandro Zummo Cc: Sergey Lapin patch-name: 1-3-rtc-fm3130-fix-add-missing-braces.patch patch-rev1: 2914a5e179bf5608c022989ae42c457ee9c89969 patch-rev2: 7a13f51dfc4360f9ff3338d4f88dd56344f096be --- drivers/rtc/rtc-fm3130.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c index 3a7be11..812c667 100644 --- a/drivers/rtc/rtc-fm3130.c +++ b/drivers/rtc/rtc-fm3130.c @@ -376,20 +376,22 @@ static int __devinit fm3130_probe(struct i2c_client *client, } /* Disabling calibration mode */ - if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) + if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_CAL) { i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, fm3130->regs[FM3130_RTC_CONTROL] & ~(FM3130_RTC_CONTROL_BIT_CAL)); dev_warn(&client->dev, "Disabling calibration mode!\n"); + } /* Disabling read and write modes */ if (fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_WRITE || - fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) + fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_READ) { i2c_smbus_write_byte_data(client, FM3130_RTC_CONTROL, fm3130->regs[FM3130_RTC_CONTROL] & ~(FM3130_RTC_CONTROL_BIT_READ | FM3130_RTC_CONTROL_BIT_WRITE)); dev_warn(&client->dev, "Disabling READ or WRITE mode!\n"); + } /* oscillator off? turn it on, so clock can tick. */ if (fm3130->regs[FM3130_CAL_CONTROL] & FM3130_CAL_CONTROL_BIT_nOSCEN)