From patchwork Tue Apr 20 09:14:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 50521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yx0-f145.google.com (mail-yx0-f145.google.com [209.85.210.145]) by ozlabs.org (Postfix) with ESMTP id 9C961B7CF8 for ; Tue, 20 Apr 2010 19:17:44 +1000 (EST) Received: by yxe9 with SMTP id 9sf8805559yxe.29 for ; Tue, 20 Apr 2010 02:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:mime-version:x-beenthere:received :received:received:received:received-spf:received:message-id :user-agent:date:from:cc:subject:references :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :sender:list-subscribe:list-unsubscribe:content-type; bh=2ci5GOWTUmPnaSACxSNa3AyPgjhy/HJnIg/Ur9A/mbE=; b=dPX42HZY/aYSQybt2bzo0yM8TU7XV5VXpfnDJvbCCzC+jT8I64LX6mgEc2RwVootoi F/dt8fziWQmCi+PQeZABIZX9BQI8J5q/0XSmu7D2JWSHelWWHxNehHf7hMb9hV5QUOuS wmY2BjOU/3tqPhruvtavZNxgqING9cBWUPXg0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:message-id:user-agent:date :from:cc:subject:references:x-original-authentication-results :x-original-sender:reply-to:precedence:mailing-list:list-id :list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; b=XnLWaMXNKYiGtc7UKCumtUc5YapEOH84PNapJR7L6cxciPOwUwN/vcqVjHYtgub4SD oaiqJDXCU4dP7ubx0FkoRAc7fEXLRzZzDR1ImqBOTjMAYtVB4DSwm5M0rBPNSpVWMwpH 2Uwh/4mf/1T2B+Kk72ZlZ+e2o/pLxOCy76OPY= Received: by 10.91.91.9 with SMTP id t9mr1863903agl.20.1271755062490; Tue, 20 Apr 2010 02:17:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.216.145.167 with SMTP id p39ls6119382wej.0.p; Tue, 20 Apr 2010 02:17:41 -0700 (PDT) Received: by 10.216.172.144 with SMTP id t16mr616551wel.25.1271755060842; Tue, 20 Apr 2010 02:17:40 -0700 (PDT) Received: by 10.216.172.144 with SMTP id t16mr616550wel.25.1271755060815; Tue, 20 Apr 2010 02:17:40 -0700 (PDT) Received: from kira.home.fluff.org (aeryn.fluff.org.uk [87.194.8.8]) by gmr-mx.google.com with ESMTP id n31si8472043wbc.4.2010.04.20.02.17.40; Tue, 20 Apr 2010 02:17:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of ben@fluff.org.uk designates 87.194.8.8 as permitted sender) client-ip=87.194.8.8; Received: from ben by kira.home.fluff.org with local (Exim 4.71) (envelope-from ) id 1O49aO-0002dc-33; Tue, 20 Apr 2010 10:17:40 +0100 Message-Id: <20100420091740.008171154@fluff.org.uk> User-Agent: quilt/0.4 Date: Tue, 20 Apr 2010 10:14:10 +0100 From: Ben Dooks Cc: RTC List , Alessandro Zummo Subject: [rtc-linux] [[PATCH] 3/4] rtc-mv: Fix 12/24 hour error message References: <20100420091407.379013348@fluff.org.uk> X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of ben@fluff.org.uk designates 87.194.8.8 as permitted sender) smtp.mail=ben@fluff.org.uk X-Original-Sender: ben@simtec.co.uk 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: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , The driver does not support the hardware's 12 hour mode, and prints an error on attach if the hardware is not in the supported 24 hour configuration. This message however states that is the 24 hour mode that is not supported (and has the minor mistake of postfixing Hour with an s). Fix the message to properly read that the 12 hour mode is not supported to avoid any confusion if the hardware is in the wrong mode. Signed-off-by: Ben Dooks Cc: RTC List Cc: Alessandro Zummo --- drivers/rtc/rtc-mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: b/drivers/rtc/rtc-mv.c =================================================================== --- a/drivers/rtc/rtc-mv.c 2010-02-24 18:52:17.000000000 +0000 +++ b/drivers/rtc/rtc-mv.c 2010-04-06 09:50:54.000000000 +0100 @@ -245,7 +245,7 @@ static int __devinit mv_rtc_probe(struct /* make sure the 24 hours mode is enabled */ rtc_time = readl(pdata->ioaddr + RTC_TIME_REG_OFFS); if (rtc_time & RTC_HOURS_12H_MODE) { - dev_err(&pdev->dev, "24 Hours mode not supported.\n"); + dev_err(&pdev->dev, "12 Hour mode not supported.\n"); return -EINVAL; }