From patchwork Thu Feb 9 22:24:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 6737 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8FFA823E01 for ; Thu, 9 Feb 2012 22:25:27 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 59859A18167 for ; Thu, 9 Feb 2012 22:25:27 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so4255939iab.11 for ; Thu, 09 Feb 2012 14:25:27 -0800 (PST) Received: by 10.50.94.228 with SMTP id df4mr6748288igb.12.1328826327111; Thu, 09 Feb 2012 14:25:27 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.12.131 with SMTP id x3cs56322ibx; Thu, 9 Feb 2012 14:25:26 -0800 (PST) Received: by 10.68.212.164 with SMTP id nl4mr10214419pbc.36.1328826326166; Thu, 09 Feb 2012 14:25:26 -0800 (PST) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id s4si6008779pbc.38.2012.02.09.14.25.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Feb 2012 14:25:26 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 9 Feb 2012 15:25:22 -0700 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 9 Feb 2012 15:24:51 -0700 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id ECCF0C90054; Thu, 9 Feb 2012 17:24:50 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q19MOoZf244742; Thu, 9 Feb 2012 17:24:50 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q19MOoLZ024367; Thu, 9 Feb 2012 17:24:50 -0500 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q19MOo8M024322; Thu, 9 Feb 2012 17:24:50 -0500 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 5D0B3BFECA; Thu, 9 Feb 2012 14:24:48 -0800 (PST) From: John Stultz To: Greg KH Cc: JP Abgrall , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Greg KH , Android Kernel Team , John Stultz Subject: [PATCH 10/12] android-alarm: Fix bad index when canceling alarms[] Date: Thu, 9 Feb 2012 14:24:39 -0800 Message-Id: <1328826281-27148-11-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1328826281-27148-1-git-send-email-john.stultz@linaro.org> References: <1328826281-27148-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12020922-3352-0000-0000-00000283EE9E X-Gm-Message-State: ALoCoQmS47LfgRS+AALh/AjUdDFrUPlPlg2Z8EU91znpWqTe8uAwh7haThf4cOw+AI59rrKWbNN+ From: JP Abgrall It was using ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK as an index. CC: Arve Hjønnevåg CC: Greg KH CC: Android Kernel Team CC: JP Abgrall Change-Id: I919860cc71254453e382616bce9fd5455802cb3d Signed-off-by: JP Abgrall [jstultz: Tweaked commit subject] Signed-off-by: John Stultz --- drivers/staging/android/alarm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 445c0b1..642a22f 100644 --- a/drivers/staging/android/alarm.c +++ b/drivers/staging/android/alarm.c @@ -400,7 +400,7 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state) hrtimer_cancel(&alarms[ANDROID_ALARM_RTC_WAKEUP].timer); hrtimer_cancel(&alarms[ - ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK].timer); + ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP].timer); tmp_queue = &alarms[ANDROID_ALARM_RTC_WAKEUP]; if (tmp_queue->first)