From patchwork Mon Nov 8 13:29:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 308352 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA8Dq1aS006889 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 8 Nov 2010 13:52:22 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1PFS8Y-0003kz-Oq; Mon, 08 Nov 2010 13:51:54 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1PFS8X-0003ks-Na for spi-devel-general@lists.sourceforge.net; Mon, 08 Nov 2010 13:51:53 +0000 X-ACL-Warn: Received: from mail-bw0-f47.google.com ([209.85.214.47]) by sog-mx-1.v43.ch3.sourceforge.com with esmtp (Exim 4.69) id 1PFS8W-0000O0-8p for spi-devel-general@lists.sourceforge.net; Mon, 08 Nov 2010 13:51:53 +0000 Received: by bwz10 with SMTP id 10so4993269bwz.34 for ; Mon, 08 Nov 2010 05:51:46 -0800 (PST) Received: by 10.204.68.137 with SMTP id v9mr4939959bki.148.1289222955755; Mon, 08 Nov 2010 05:29:15 -0800 (PST) Received: from notebook.monstr.eu (gw.wifiinternet.cz [89.31.42.6]) by mx.google.com with ESMTPS id d27sm3862471bkw.2.2010.11.08.05.29.13 (version=SSLv3 cipher=RC4-MD5); Mon, 08 Nov 2010 05:29:14 -0800 (PST) Message-ID: <4CD7FB27.9030804@monstr.eu> Date: Mon, 08 Nov 2010 14:29:11 +0100 From: Michal Simek User-Agent: Thunderbird 2.0.0.18 (X11/20081120) MIME-Version: 1.0 To: Grant Likely Subject: Re: [RFC PATCH 0/3] spi/xilinx: Merge OF and non-OF drivers References: <20101014161724.18966.42340.stgit@localhost6.localdomain6> In-Reply-To: <20101014161724.18966.42340.stgit@localhost6.localdomain6> X-Spam-Score: 1.5 (+) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.47 listed in list.dnswl.org] 1.5 RCVD_IN_PSBL RBL: Received via a relay in PSBL [89.31.42.6 listed in psbl.surriel.com] X-Headers-End: 1PFS8W-0000O0-8p Cc: spi-devel-general@lists.sourceforge.net, richard.rojfors@mocean-labs.com, john.linn@xilinx.com, linux-kernel@vger.kernel.org X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: monstr@monstr.eu List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 08 Nov 2010 13:52:22 +0000 (UTC) diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 7adaef6..3612e1b 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -519,6 +519,9 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev) } platform_set_drvdata(dev, master); + /* clear the dma_mask, to try to disable use of dma */ + dev->dev.dma_mask = 0; + return 0; }