From patchwork Fri Jan 13 03:10:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 6176 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 2348523E14 for ; Fri, 13 Jan 2012 03:10:27 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 0CCA6A185EB for ; Fri, 13 Jan 2012 03:10:27 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id zu5so2430515bkb.11 for ; Thu, 12 Jan 2012 19:10:27 -0800 (PST) Received: by 10.204.153.27 with SMTP id i27mr54268bkw.81.1326424226880; Thu, 12 Jan 2012 19:10:26 -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.205.82.144 with SMTP id ac16cs19811bkc; Thu, 12 Jan 2012 19:10:26 -0800 (PST) Received: by 10.180.72.162 with SMTP id e2mr767566wiv.8.1326424224729; Thu, 12 Jan 2012 19:10:24 -0800 (PST) Received: from DB3EHSOBE006.bigfish.com (db3ehsobe006.messaging.microsoft.com. [213.199.154.144]) by mx.google.com with ESMTPS id fi2si4482131wbb.33.2012.01.12.19.10.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Jan 2012 19:10:24 -0800 (PST) Received-SPF: neutral (google.com: 213.199.154.144 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=213.199.154.144; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.154.144 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail17-db3-R.bigfish.com (10.3.81.250) by DB3EHSOBE006.bigfish.com (10.3.84.26) with Microsoft SMTP Server id 14.1.225.23; Fri, 13 Jan 2012 03:10:23 +0000 Received: from mail17-db3 (localhost [127.0.0.1]) by mail17-db3-R.bigfish.com (Postfix) with ESMTP id 68DCE5805F0; Fri, 13 Jan 2012 03:10:23 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dhc1ahc1bh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail17-db3 (localhost.localdomain [127.0.0.1]) by mail17-db3 (MessageSwitch) id 1326424223312381_20544; Fri, 13 Jan 2012 03:10:23 +0000 (UTC) Received: from DB3EHSMHS018.bigfish.com (unknown [10.3.81.246]) by mail17-db3.bigfish.com (Postfix) with ESMTP id 45CE45C004B; Fri, 13 Jan 2012 03:10:23 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS018.bigfish.com (10.3.87.118) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 13 Jan 2012 03:10:23 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.355.3; Thu, 12 Jan 2012 21:10:21 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id q0D3A36U003861; Thu, 12 Jan 2012 21:10:19 -0600 (CST) From: Richard Zhao To: , CC: , , , , , , Richard Zhao Subject: [PATCH v2 5/6] dma/imx-sdma: use num_events to validate event_id0 Date: Fri, 13 Jan 2012 11:10:00 +0800 Message-ID: <1326424201-20056-6-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1326424201-20056-1-git-send-email-richard.zhao@linaro.org> References: <1326424201-20056-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com event number is not always 32. use num_events for checking instead. Signed-off-by: Richard Zhao Acked-by: Shawn Guo --- drivers/dma/imx-sdma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 015d93f..22fd561 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -723,7 +723,7 @@ static int sdma_config_channel(struct sdma_channel *sdmac) sdmac->per_addr = 0; if (sdmac->event_id0) { - if (sdmac->event_id0 > 32) + if (sdmac->event_id0 >= sdmac->sdma->num_events) return -EINVAL; sdma_event_enable(sdmac, sdmac->event_id0); }