Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / sound / soc / ux500 / ux500_msp_dai.c

diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index f5df08ded770ef9cbafd3ec88903893bc4657344..6d5698b25bd4b25c92c128860527245167d665d0 100644 (file)
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -522,9 +522,9 @@ static int ux500_msp_dai_hw_params(struct snd_pcm_substream *substream,
                slots_active = hweight32(mask);
                dev_dbg(dai->dev, "TDM-slots active: %d", slots_active);
 
-               snd_pcm_hw_constraint_minmax(runtime,
+               snd_pcm_hw_constraint_single(runtime,
                                SNDRV_PCM_HW_PARAM_CHANNELS,
-                               slots_active, slots_active);
+                               slots_active);
                break;
 
        default:
@@ -843,6 +843,7 @@ static const struct of_device_id ux500_msp_i2s_match[] = {
        { .compatible = "stericsson,ux500-msp-i2s", },
        {},
 };
+MODULE_DEVICE_TABLE(of, ux500_msp_i2s_match);
 
 static struct platform_driver msp_i2s_driver = {
        .driver = {