diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-04 22:22:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-04 22:22:06 -0700 |
| commit | f2fedb98bdc25f45128c666961b381f6b77a9873 (patch) | |
| tree | 08f66befda1504c58ce4a74d2d5df7b0efddb423 /drivers/char | |
| parent | 115a8ef46d21fe4e0bcef96a442ace7b92412b78 (diff) | |
| parent | f139281b60ad455a948479913c469cab40e757be (diff) | |
Merge "diag: Fix race condition while closing SMD"
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/diag/diagfwd_peripheral.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/diag/diagfwd_peripheral.c b/drivers/char/diag/diagfwd_peripheral.c index 731b42c56998..40fdcbaaf31a 100644 --- a/drivers/char/diag/diagfwd_peripheral.c +++ b/drivers/char/diag/diagfwd_peripheral.c @@ -651,13 +651,12 @@ void diagfwd_close_transport(uint8_t transport, uint8_t peripheral) break; default: return; - } + mutex_lock(&driver->diagfwd_channel_mutex); fwd_info = &early_init_info[transport][peripheral]; if (fwd_info->p_ops && fwd_info->p_ops->close) fwd_info->p_ops->close(fwd_info->ctxt); - mutex_lock(&driver->diagfwd_channel_mutex); fwd_info = &early_init_info[transport_open][peripheral]; dest_info = &peripheral_info[TYPE_CNTL][peripheral]; dest_info->inited = 1; |