diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-06 21:28:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-06 21:28:56 -0800 |
| commit | b6cce1559ba3fe6c7402863a88c0d446859d7d92 (patch) | |
| tree | ea6b2cb53737d15161cfb683b35466de5c7f557e /drivers | |
| parent | ad33cbf95e9a5eb256f3d7bc8c9eff3d7d675b34 (diff) | |
| parent | 04c6078424f250aa25cd308f47468a68474bf7cb (diff) | |
Merge "spi : spi_qsd : Initialise complete signal only once in probe"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi_qsd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/spi/spi_qsd.c b/drivers/spi/spi_qsd.c index 799bf2988b30..cf1ea19dbc6a 100644 --- a/drivers/spi/spi_qsd.c +++ b/drivers/spi/spi_qsd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1390,8 +1390,8 @@ static int msm_spi_process_transfer(struct msm_spi *dd) dd->write_buf = dd->cur_transfer->tx_buf; dd->tx_done = false; dd->rx_done = false; - init_completion(&dd->tx_transfer_complete); - init_completion(&dd->rx_transfer_complete); + reinit_completion(&dd->tx_transfer_complete); + reinit_completion(&dd->rx_transfer_complete); if (dd->cur_transfer->bits_per_word) bpw = dd->cur_transfer->bits_per_word; else @@ -2716,6 +2716,8 @@ skip_dma_resources: spin_lock_init(&dd->queue_lock); mutex_init(&dd->core_lock); init_waitqueue_head(&dd->continue_suspend); + init_completion(&dd->tx_transfer_complete); + init_completion(&dd->rx_transfer_complete); if (!devm_request_mem_region(&pdev->dev, dd->mem_phys_addr, dd->mem_size, SPI_DRV_NAME)) { |