diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 00:47:11 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 00:47:11 -0800 |
| commit | e32d8d4081e6bf731284bc45a637de4d5d3d2fd5 (patch) | |
| tree | b60c7be74010c2e2635a20f0ef933dbc2855b0f3 /include/linux | |
| parent | 68452b543d614a102f85089c90ec170cb73bbafe (diff) | |
| parent | 63cd5102a403b5ca68feacf1a02e451c6305e4e3 (diff) | |
Merge "drivers: mfd: fix audio mute issue after ADSP SSR"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/wcd9xxx/core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mfd/wcd9xxx/core.h b/include/linux/mfd/wcd9xxx/core.h index 11e8d89c337b..6eb8c1893a53 100644 --- a/include/linux/mfd/wcd9xxx/core.h +++ b/include/linux/mfd/wcd9xxx/core.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2017, 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 @@ -334,6 +334,7 @@ struct wcd9xxx { struct slim_device *slim_slave; struct mutex io_lock; struct mutex xfer_lock; + struct mutex reset_lock; u8 version; int reset_gpio; |