diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
| commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
| tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /sound/pci/hda/patch_hdmi.c | |
| parent | 623eb15647fc35c5a8cd38985d5958240eb072c1 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d3e49aa5b9ec..31df7747990d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
| @@ -834,7 +834,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, | |||
| 834 | return -ENODEV; | 834 | return -ENODEV; |
| 835 | } else { | 835 | } else { |
| 836 | /* fallback to the codec default */ | 836 | /* fallback to the codec default */ |
| 837 | hinfo->channels_min = codec_pars->channels_min; | ||
| 838 | hinfo->channels_max = codec_pars->channels_max; | 837 | hinfo->channels_max = codec_pars->channels_max; |
| 839 | hinfo->rates = codec_pars->rates; | 838 | hinfo->rates = codec_pars->rates; |
| 840 | hinfo->formats = codec_pars->formats; | 839 | hinfo->formats = codec_pars->formats; |