aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-10-28 07:00:35 -0400
committerTakashi Iwai <tiwai@suse.de>2013-10-29 06:37:30 -0400
commitca16ec02e1887cc88e9eb3504ee8ea6d8112d05d (patch)
treee643cfb6aa31c46e2839b60a2c08f51133a37ee6 /sound/pci
parent57d8ff617f871eee11bb2f648505592c2e859d0f (diff)
ALSA: hda - Remove locally dead codes
Reported by coverity. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_codec.c3
-rw-r--r--sound/pci/hda/patch_realtek.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 0faab3b4dabb..de1a7670ba0d 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2634,8 +2634,7 @@ static int map_slaves(struct hda_codec *codec, const char * const *slaves,
2634 items = codec->mixers.list; 2634 items = codec->mixers.list;
2635 for (i = 0; i < codec->mixers.used; i++) { 2635 for (i = 0; i < codec->mixers.used; i++) {
2636 struct snd_kcontrol *sctl = items[i].kctl; 2636 struct snd_kcontrol *sctl = items[i].kctl;
2637 if (!sctl || !sctl->id.name || 2637 if (!sctl || sctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER)
2638 sctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER)
2639 continue; 2638 continue;
2640 for (s = slaves; *s; s++) { 2639 for (s = slaves; *s; s++) {
2641 char tmpname[sizeof(sctl->id.name)]; 2640 char tmpname[sizeof(sctl->id.name)];
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 1f0a040a9818..894703532ab7 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -554,8 +554,6 @@ do_sku:
554 nid = portd; 554 nid = portd;
555 else if (tmp == 3) 555 else if (tmp == 3)
556 nid = porti; 556 nid = porti;
557 else
558 return 1;
559 if (found_in_nid_list(nid, spec->gen.autocfg.line_out_pins, 557 if (found_in_nid_list(nid, spec->gen.autocfg.line_out_pins,
560 spec->gen.autocfg.line_outs)) 558 spec->gen.autocfg.line_outs))
561 return 1; 559 return 1;