Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328625
b: refs/heads/master
c: 41682e0
h: refs/heads/master
i:
  328623: c934285
v: v3
  • Loading branch information
Marek Vasut authored and Mark Brown committed Aug 27, 2012
1 parent 05f9a91 commit d21179a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c895db0fb2c9e77fd94ba7995e2a01652a91910c
refs/heads/master: 41682e03d4fdc947dbd22725d70f222cc7746852
4 changes: 3 additions & 1 deletion trunk/drivers/spi/spi-mxs.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
return -EINVAL;
}

init_completion(&spi->c);
INIT_COMPLETION(spi->c);

if (*first)
pio |= BM_SSP_CTRL0_LOCK_CS;
Expand Down Expand Up @@ -549,6 +549,8 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev)
ssp->devid = devid;
ssp->dma_channel = dma_channel;

init_completion(&spi->c);

ret = devm_request_irq(&pdev->dev, irq_err, mxs_ssp_irq_handler, 0,
DRIVER_NAME, ssp);
if (ret)
Expand Down

0 comments on commit d21179a

Please sign in to comment.