diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
| commit | d61b04f801e6005182d432ebe4a0211c1d6feadd (patch) | |
| tree | aa085e56e1be528917212f41c485eebdfc072930 /sound/soc/generic/simple-card.c | |
| parent | 30ff5957c3f1887d04ca01d839dc382739e48bde (diff) | |
| parent | 473f414564528a819f0c2bb6b4bf26366b64c9ab (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/generic/simple-card.c')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 1ded8811598e..2389ab47e25f 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -99,7 +99,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, if (ret && ret != -ENOTSUPP) goto err; } - + return 0; err: return ret; } |