git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
ti
/
omap-mcbsp.c
diff --git
a/sound/soc/ti/omap-mcbsp.c
b/sound/soc/ti/omap-mcbsp.c
index 6025b30bbe77ec4c5c787fabfc51dc8e6452850d..db47981768c5d76435ddc570eb51366a930975aa 100644
(file)
--- a/
sound/soc/ti/omap-mcbsp.c
+++ b/
sound/soc/ti/omap-mcbsp.c
@@
-373,10
+373,9
@@
static void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
MCBSP_WRITE(mcbsp, WAKEUPEN, 0);
/* Disable interrupt requests */
- if (mcbsp->irq)
+ if (mcbsp->irq)
{
MCBSP_WRITE(mcbsp, IRQEN, 0);
- if (mcbsp->irq) {
free_irq(mcbsp->irq, (void *)mcbsp);
} else {
free_irq(mcbsp->rx_irq, (void *)mcbsp);