From patchwork Wed Jan 28 12:23:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 5737161 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4E8209F36E for ; Thu, 29 Jan 2015 03:42:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 26418201BB for ; Thu, 29 Jan 2015 03:42:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B4B4201CE for ; Thu, 29 Jan 2015 03:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752878AbbA2Bi4 (ORCPT ); Wed, 28 Jan 2015 20:38:56 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:61123 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753375AbbA2Biy (ORCPT ); Wed, 28 Jan 2015 20:38:54 -0500 Received: by mail-lb0-f180.google.com with SMTP id b6so23093149lbj.11; Wed, 28 Jan 2015 17:38:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nJMA/UGWQP/71OhSWnzp4JkK8r2K8SVqm+7EEHnScNk=; b=NU9r5kAllORiOhEZVyJUdIjOaBRXdPRIiMZ0uzxn7h6XQORdvsejyOXhnEm6+2Y8nX xGJ0m5XMtW8WBGLcUdJQMhYkoSPEMpqftZDz2mNDsW1T1Hu4trsJXe8E2FMiXGCFUL5o HIwuNm8tGotTKbiSW1r2dV8l91zDl+sL6NPNps7QONInJBI5ZM1OKiJlaj/pGV0ncER/ jC/n5iO7S3fvmfCjD4Zmh4haQARzyHW5K0aLXOmpgyX1dCQpf7k0J7LD0X/UecxIcq5x W2nbM8J76/S3SFjvypTAtk0o6oSun+kvGnimmMvroq5F/C7zkwMtLHUI2vgFVUED5biW P96Q== X-Received: by 10.152.88.104 with SMTP id bf8mr6198268lab.65.1422447855563; Wed, 28 Jan 2015 04:24:15 -0800 (PST) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by mx.google.com with ESMTPSA id xh7sm1293741lbb.17.2015.01.28.04.24.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Jan 2015 04:24:14 -0800 (PST) From: Ricardo Ribalda Delgado To: Mark Brown , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v2 14/15] spi/xilinx: Check number of slaves range Date: Wed, 28 Jan 2015 13:23:53 +0100 Message-Id: <1422447834-23116-15-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com> References: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The core only supports up to 32 slaves, and the chipselect function expects the same. Signed-off-by: Ricardo Ribalda Delgado --- drivers/spi/spi-xilinx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 026f4c5..134d8cd 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -22,6 +22,8 @@ #include #include +#define MAX_CS 32 + #define XILINX_SPI_NAME "xilinx_spi" /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e) @@ -340,6 +342,11 @@ static int xilinx_spi_probe(struct platform_device *pdev) return -EINVAL; } + if (num_cs > MAX_CS) { + dev_err(&pdev->dev, "Invalid number of spi slaves\n"); + return -EINVAL; + } + master = spi_alloc_master(&pdev->dev, sizeof(struct xilinx_spi)); if (!master) return -ENODEV;