diff options
Diffstat (limited to 'sound/soc/dwc/designware_i2s.c')
-rw-r--r-- | sound/soc/dwc/designware_i2s.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index ce664c239be3..bff258d7bcea 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c | |||
@@ -645,6 +645,8 @@ static int dw_i2s_probe(struct platform_device *pdev) | |||
645 | 645 | ||
646 | dev->dev = &pdev->dev; | 646 | dev->dev = &pdev->dev; |
647 | 647 | ||
648 | dev->i2s_reg_comp1 = I2S_COMP_PARAM_1; | ||
649 | dev->i2s_reg_comp2 = I2S_COMP_PARAM_2; | ||
648 | if (pdata) { | 650 | if (pdata) { |
649 | dev->capability = pdata->cap; | 651 | dev->capability = pdata->cap; |
650 | clk_id = NULL; | 652 | clk_id = NULL; |
@@ -652,9 +654,6 @@ static int dw_i2s_probe(struct platform_device *pdev) | |||
652 | if (dev->quirks & DW_I2S_QUIRK_COMP_REG_OFFSET) { | 654 | if (dev->quirks & DW_I2S_QUIRK_COMP_REG_OFFSET) { |
653 | dev->i2s_reg_comp1 = pdata->i2s_reg_comp1; | 655 | dev->i2s_reg_comp1 = pdata->i2s_reg_comp1; |
654 | dev->i2s_reg_comp2 = pdata->i2s_reg_comp2; | 656 | dev->i2s_reg_comp2 = pdata->i2s_reg_comp2; |
655 | } else { | ||
656 | dev->i2s_reg_comp1 = I2S_COMP_PARAM_1; | ||
657 | dev->i2s_reg_comp2 = I2S_COMP_PARAM_2; | ||
658 | } | 657 | } |
659 | ret = dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata); | 658 | ret = dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata); |
660 | } else { | 659 | } else { |