diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /drivers/spi | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |