aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 68dc9a2e3cf8..cbb3da408e80 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1393,7 +1393,6 @@ static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
1393 1393
1394static int __devinit azx_pcm_create(struct azx *chip) 1394static int __devinit azx_pcm_create(struct azx *chip)
1395{ 1395{
1396 struct list_head *p;
1397 struct hda_codec *codec; 1396 struct hda_codec *codec;
1398 int c, err; 1397 int c, err;
1399 int pcm_dev; 1398 int pcm_dev;
@@ -1404,8 +1403,7 @@ static int __devinit azx_pcm_create(struct azx *chip)
1404 1403
1405 /* create audio PCMs */ 1404 /* create audio PCMs */
1406 pcm_dev = 0; 1405 pcm_dev = 0;
1407 list_for_each(p, &chip->bus->codec_list) { 1406 list_for_each_entry(codec, &chip->bus->codec_list, list) {
1408 codec = list_entry(p, struct hda_codec, list);
1409 for (c = 0; c < codec->num_pcms; c++) { 1407 for (c = 0; c < codec->num_pcms; c++) {
1410 if (codec->pcm_info[c].is_modem) 1408 if (codec->pcm_info[c].is_modem)
1411 continue; /* create later */ 1409 continue; /* create later */
@@ -1424,8 +1422,7 @@ static int __devinit azx_pcm_create(struct azx *chip)
1424 1422
1425 /* create modem PCMs */ 1423 /* create modem PCMs */
1426 pcm_dev = AZX_MAX_AUDIO_PCMS; 1424 pcm_dev = AZX_MAX_AUDIO_PCMS;
1427 list_for_each(p, &chip->bus->codec_list) { 1425 list_for_each_entry(codec, &chip->bus->codec_list, list) {
1428 codec = list_entry(p, struct hda_codec, list);
1429 for (c = 0; c < codec->num_pcms; c++) { 1426 for (c = 0; c < codec->num_pcms; c++) {
1430 if (!codec->pcm_info[c].is_modem) 1427 if (!codec->pcm_info[c].is_modem)
1431 continue; /* already created */ 1428 continue; /* already created */