From 6b8121f30d001e2cbae6ede6822f70c73dc3100a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Sun, 23 Oct 2011 00:19:18 -0700 Subject: HACK merge fixups for compile Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54 --- drivers/spi/spi-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/spi') diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c index 6afca0ec7ab5..e1741cd20295 100644 --- a/drivers/spi/spi-tegra.c +++ b/drivers/spi/spi-tegra.c @@ -1470,7 +1470,7 @@ static int spi_tegra_suspend(struct platform_device *pdev, pm_message_t state) dev_err(&pdev->dev, "Spi transfer is in progress " "Avoiding suspend\n"); tspi->is_suspended = false; - spi_unlock_irqrestore(&tspi->lock, flags); + spin_unlock_irqrestore(&tspi->lock, flags); return -EBUSY; } -- cgit v1.2.3