Merge tag 'iwlwifi-fixes-for-kalle-2014-12-18' of git://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / sound / soc / samsung / idma.c

diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index db6cefa18017c1db57568689661fc21bc80ec6ea..4ed29ffc1c54e5f0bdff27eafb5cb35c80b15afe 100644 (file)
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -351,7 +351,7 @@ static void idma_free(struct snd_pcm *pcm)
        if (!buf->area)
                return;
 
-       iounmap(buf->area);
+       iounmap((void __iomem *)buf->area);
 
        buf->area = NULL;
        buf->addr = 0;
@@ -369,7 +369,7 @@ static int preallocate_idma_buffer(struct snd_pcm *pcm, int stream)
        buf->dev.type = SNDRV_DMA_TYPE_CONTINUOUS;
        buf->addr = idma.lp_tx_addr;
        buf->bytes = idma_hardware.buffer_bytes_max;
-       buf->area = (unsigned char *)ioremap(buf->addr, buf->bytes);
+       buf->area = (unsigned char * __force)ioremap(buf->addr, buf->bytes);
 
        return 0;
 }
@@ -418,7 +418,6 @@ static int asoc_idma_platform_probe(struct platform_device *pdev)
 static struct platform_driver asoc_idma_driver = {
        .driver = {
                .name = "samsung-idma",
-               .owner = THIS_MODULE,
        },
 
        .probe = asoc_idma_platform_probe,