Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Sep 23, 2015
2 parents 1f93e4a + 75881df commit 5ee84ba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -3501,7 +3501,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,

default:
WARN(1, "Unknown event %d\n", event);
return -EINVAL;
ret = -EINVAL;
}

out:
Expand Down

0 comments on commit 5ee84ba

Please sign in to comment.