--- sound/pci/hda/patch_realtek.c

+++ sound/pci/hda/patch_realtek.c

@@ -6455,7 +6455,6 @@ static int patch_alc260(struct hda_codec

spec->stream_analog_playback = &alc260_pcm_analog_playback;

spec->stream_analog_capture = &alc260_pcm_analog_capture;

- spec->stream_analog_alt_capture = &alc260_pcm_analog_capture;

spec->stream_digital_playback = &alc260_pcm_digital_playback;

spec->stream_digital_capture = &alc260_pcm_digital_capture;

@@ -6589,7 +6588,7 @@ static struct hda_input_mux alc883_lenov

.num_items = 4,

.items = {

{ "Mic", 0x0 },

- { "Int Mic", 0x1 },

+ { "iMic", 0x1 },

{ "Line", 0x2 },

{ "CD", 0x4 },

},

@@ -8038,8 +8037,8 @@ static struct snd_kcontrol_new alc883_le

HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),

HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),

HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),

- HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),

- HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),

+ HDA_CODEC_VOLUME("iMic Playback Volume", 0x0b, 0x1, HDA_INPUT),

+ HDA_CODEC_MUTE("iMic Playback Switch", 0x0b, 0x1, HDA_INPUT),

{ } /* end */

};

@@ -12389,9 +12388,6 @@ static int alc268_new_analog_output(stru

dac = 0x02;

break;

case 0x15:

- case 0x1a: /* ALC259/269 only */

- case 0x1b: /* ALC259/269 only */

- case 0x21: /* ALC269vb has this pin, too */

dac = 0x03;

break;

default:

@@ -17260,8 +17256,6 @@ static inline hda_nid_t alc662_mix_to_da

return 0x02;

else if (nid >= 0x0c && nid <= 0x0e)

return nid - 0x0c + 0x02;

- else if (nid == 0x26) /* ALC887-VD has this DAC too */

- return 0x25;

else

return 0;

}

@@ -17270,7 +17264,7 @@ static inline hda_nid_t alc662_mix_to_da

static hda_nid_t alc662_dac_to_mix(struct hda_codec *codec, hda_nid_t pin,

hda_nid_t dac)

{

- hda_nid_t mix[5];

+ hda_nid_t mix[4];

int i, num;

num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));