diff options
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index a65f17d57ffb..2595611e8a6d 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c | |||
@@ -160,7 +160,7 @@ struct fsl_ssi_soc_data { | |||
160 | */ | 160 | */ |
161 | struct fsl_ssi_private { | 161 | struct fsl_ssi_private { |
162 | struct regmap *regs; | 162 | struct regmap *regs; |
163 | unsigned int irq; | 163 | int irq; |
164 | struct snd_soc_dai_driver cpu_dai_drv; | 164 | struct snd_soc_dai_driver cpu_dai_drv; |
165 | 165 | ||
166 | unsigned int dai_fmt; | 166 | unsigned int dai_fmt; |
@@ -992,8 +992,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, | |||
992 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, | 992 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, |
993 | CCSR_SSI_SCR_SSIEN); | 993 | CCSR_SSI_SCR_SSIEN); |
994 | 994 | ||
995 | regmap_write(regs, CCSR_SSI_STMSK, tx_mask); | 995 | regmap_write(regs, CCSR_SSI_STMSK, ~tx_mask); |
996 | regmap_write(regs, CCSR_SSI_SRMSK, rx_mask); | 996 | regmap_write(regs, CCSR_SSI_SRMSK, ~rx_mask); |
997 | 997 | ||
998 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val); | 998 | regmap_update_bits(regs, CCSR_SSI_SCR, CCSR_SSI_SCR_SSIEN, val); |
999 | 999 | ||
@@ -1363,8 +1363,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) | |||
1363 | 1363 | ||
1364 | ssi_private->irq = platform_get_irq(pdev, 0); | 1364 | ssi_private->irq = platform_get_irq(pdev, 0); |
1365 | if (!ssi_private->irq) { | 1365 | if (!ssi_private->irq) { |
1366 | dev_err(&pdev->dev, "no irq for node %s\n", np->full_name); | 1366 | dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); |
1367 | return -ENXIO; | 1367 | return ssi_private->irq; |
1368 | } | 1368 | } |
1369 | 1369 | ||
1370 | /* Are the RX and the TX clocks locked? */ | 1370 | /* Are the RX and the TX clocks locked? */ |