These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / spi / spi-s3c24xx.c

diff --git a/kernel/drivers/spi/spi-s3c24xx.c b/kernel/drivers/spi/spi-s3c24xx.c
index f747ca2..4e7d1bf 100644 (file)
--- a/kernel/drivers/spi/spi-s3c24xx.c
+++ b/kernel/drivers/spi/spi-s3c24xx.c
@@ -198,12 +198,12 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
        if (ret)
                return ret;
 
-       spin_lock(&hw->bitbang.lock);
+       mutex_lock(&hw->bitbang.lock);
        if (!hw->bitbang.busy) {
                hw->bitbang.chipselect(spi, BITBANG_CS_INACTIVE);
                /* need to ndelay for 0.5 clocktick ? */
        }
-       spin_unlock(&hw->bitbang.lock);
+       mutex_unlock(&hw->bitbang.lock);
 
        return 0;
 }
@@ -501,7 +501,6 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
        }
 
        hw = spi_master_get_devdata(master);
-       memset(hw, 0, sizeof(struct s3c24xx_spi));
 
        hw->master = master;
        hw->pdata = pdata = dev_get_platdata(&pdev->dev);