Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

[platform/kernel/linux-rpi.git] / drivers / spi / spidev.c

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index c62ba8f..f74eeca 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -634,6 +634,9 @@ static int spidev_release(struct inode *inode, struct file *filp)
                if (dofree)
                        kfree(spidev);
        }
+#ifdef CONFIG_SPI_SLAVE
+       spi_slave_abort(spidev->spi);
+#endif
        mutex_unlock(&device_list_lock);
 
        return 0;