diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-28 12:00:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-29 11:37:30 +0100 |
| commit | ca16ec02e1887cc88e9eb3504ee8ea6d8112d05d (patch) | |
| tree | e643cfb6aa31c46e2839b60a2c08f51133a37ee6 /sound/pci | |
| parent | 57d8ff617f871eee11bb2f648505592c2e859d0f (diff) | |
| download | linux-ca16ec02e1887cc88e9eb3504ee8ea6d8112d05d.tar.bz2 | |
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.c | 3 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
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, items = codec->mixers.list; for (i = 0; i < codec->mixers.used; i++) { struct snd_kcontrol *sctl = items[i].kctl; - if (!sctl || !sctl->id.name || - sctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER) + if (!sctl || sctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER) continue; for (s = slaves; *s; s++) { 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: nid = portd; else if (tmp == 3) nid = porti; - else - return 1; if (found_in_nid_list(nid, spec->gen.autocfg.line_out_pins, spec->gen.autocfg.line_outs)) return 1; |