From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756959AbcKWRB7 (ORCPT ); Wed, 23 Nov 2016 12:01:59 -0500 Received: from mail1.bemta12.messagelabs.com ([216.82.251.2]:35673 "EHLO mail1.bemta12.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756886AbcKWRBz (ORCPT ); Wed, 23 Nov 2016 12:01:55 -0500 X-Greylist: delayed 412 seconds by postgrey-1.27 at vger.kernel.org; Wed, 23 Nov 2016 12:01:55 EST X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMIsWRWlGSWpSXmKPExsVy+LrFKt3HJ00 jDDbPlbRYPfUvq8XlXXPYLH48nM5kMaf/KZtFy9MZjBYv+/azOLB59K/7zOqxeM9LJo9z7ycz ebw5fYrd4/MmuQDWKNbMvKT8igTWjP2dj1gL1rFW3Nx/iK2BcRdLFyMXh5DAMkaJ21PuMHUxc nIIC+hJbN11ggXEFhFwlfgzYSFYEbPAdkaJd52vGUESQgL6EtOmLQcrYhMwkbh5/xyYzQsUf7 nxHVgNi4CqRMumDrC4qECCxKenP6FqBCVOznwCZnMKGEhcXv0dbDEzUG/T1jnMELa8xPa3ELa QgLbE+42LWUFsCQEFiamTW5knMPLPQjJqFpL2WUjaFzAyr2LUKE4tKkst0jUy0UsqykzPKMlN zMzRNTQ00stNLS5OTE/NSUwq1kvOz93ECAzwegYGxh2MC6d7HWKU5GBSEuU9vdE0QogvKT+lM iOxOCO+qDQntfgQowwHh5IEb9EJoJxgUWp6akVaZg4w1mDSEhw8SiK8h0DSvMUFibnFmekQqV OMuhzvNr97wCTEkpeflyolzvsVpEgApCijNA9uBCzuLzHKSgnzMjIwMAjxFKQW5WaWoMq/YhT nYFQS5j0JMoUnM68EbtMroCOYgI6Q/GYMckRJIkJKqoEx+q1a8QLBNgubs4+uV57puNQqdO7z 9L7MPxe3NTUx+Kwwm1S4W+Mly7uXAT1SHk/lzih+PVb3arck++Jg51vnZRveXTc0O5BV+Ln4a zWDg7FmoXhp+exokc9qP94/T1hrYnUmyqNYUn1pdgv7laY7fBya89vrF2b0VU1xYOwSvVwm52 pvb6fEUpyRaKjFXFScCAAfRiiI9gIAAA== X-Env-Sender: Marc_Gonzalez@sigmadesigns.com X-Msg-Ref: server-5.tower-219.messagelabs.com!1479920097!121735796!1 X-Originating-IP: [195.215.56.170] X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Subject: [PATCH 4/6] Fixup tangox_dma_sbox_map To: Mans Rullgard , Vinod Koul CC: , LKML , Sebastian Frias , Mason , Thibaud Cornic References: <5835C84A.6000706@sigmadesigns.com> From: Marc Gonzalez Message-ID: <5835C929.4020100@sigmadesigns.com> Date: Wed, 23 Nov 2016 17:51:53 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0 SeaMonkey/2.40 MIME-Version: 1.0 In-Reply-To: <5835C84A.6000706@sigmadesigns.com> Content-Type: text/plain; charset="ISO-8859-15" Content-Transfer-Encoding: 7bit X-Originating-IP: [172.27.0.114] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --- drivers/dma/tango-dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma/tango-dma.c b/drivers/dma/tango-dma.c index 6a32d234ffb0..5250c053a7b9 100644 --- a/drivers/dma/tango-dma.c +++ b/drivers/dma/tango-dma.c @@ -108,11 +108,11 @@ static struct tangox_dma_desc *tangox_dma_alloc_desc(unsigned int num_sgs) static void tangox_dma_sbox_map(struct tangox_dma_device *dev, int src, int dst) { - void __iomem *addr = dev->sbox_base + 8; + void __iomem *addr = dev->sbox_base + SBOX_ROUTE; int shift = (dst - 1) * 4; - if (shift > 31) { - addr += 4; + if (dst > 8) { + addr = dev->sbox_base + SBOX_ROUTE2; shift -= 32; } -- 2.9.0