diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2014-07-15 14:21:50 +0400 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-07-28 14:01:47 +0400 |
| commit | 30a2af3a320d5c0598cde08ba6e5d22a724f82e4 (patch) | |
| tree | a2f1b1e2928618a6649784f4a002821efc4e05a9 /include/linux/mfd | |
| parent | 6e440d27aa2212c714c8b061dea2d64cff0bc482 (diff) | |
| download | linux-30a2af3a320d5c0598cde08ba6e5d22a724f82e4.tar.xz | |
mfd: arizona: Only free the CTRLIF_ERR IRQ if we requested it
We only request the control interface error IRQ if we set ctrlif_error,
as such we should only free it in that situation. Otherwise we will
attempt to free an IRQ we never requested and get a warning from the IRQ
core.
This patch moves the ctrlif_error variable into the arizona structure
and checks it in all cases we free the control interface error IRQ.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/arizona/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h index 8bc7601cca68..fdd8b7b82db5 100644 --- a/include/linux/mfd/arizona/core.h +++ b/include/linux/mfd/arizona/core.h @@ -132,6 +132,8 @@ struct arizona { struct mutex clk_lock; int clk32k_ref; + bool ctrlif_error; + struct snd_soc_dapm_context *dapm; }; |