DMA: shdma: fix CHCLR register address calculation
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Tue, 2 Jul 2013 15:37:58 +0000 (17:37 +0200)
committerVinod Koul <vinod.koul@intel.com>
Sun, 25 Aug 2013 06:18:22 +0000 (11:48 +0530)
struct sh_dmae_device::chan_reg is a pointer to u32, therefore when adding
offsets to it care should be taken to add offsets in sizeof(u32) units, not
in bytes. This patch corrects such a bug. While at it we also remove the
redundant parameter of the affected function.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/sh/shdma.c

index b67f45f5c2712a8c16be7afad085bd745649a708..fca7a0cdfd280c811f04fdeddff3a6c47386a985 100644 (file)
 static DEFINE_SPINLOCK(sh_dmae_lock);
 static LIST_HEAD(sh_dmae_devices);
 
-static void chclr_write(struct sh_dmae_chan *sh_dc, u32 data)
+static void channel_clear(struct sh_dmae_chan *sh_dc)
 {
        struct sh_dmae_device *shdev = to_sh_dev(sh_dc);
 
-       __raw_writel(data, shdev->chan_reg +
-                    shdev->pdata->channel[sh_dc->shdma_chan.id].chclr_offset);
+       __raw_writel(0, shdev->chan_reg +
+               shdev->pdata->channel[sh_dc->shdma_chan.id].chclr_offset / sizeof(u32));
 }
 
 static void sh_dmae_writel(struct sh_dmae_chan *sh_dc, u32 data, u32 reg)
@@ -133,7 +133,7 @@ static int sh_dmae_rst(struct sh_dmae_device *shdev)
                for (i = 0; i < shdev->pdata->channel_num; i++) {
                        struct sh_dmae_chan *sh_chan = shdev->chan[i];
                        if (sh_chan)
-                               chclr_write(sh_chan, 0);
+                               channel_clear(sh_chan);
                }
        }