diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/debian/bzr-builder.manifest oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/debian/bzr-builder.manifest --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/debian/bzr-builder.manifest 2016-02-09 17:46:39.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/debian/bzr-builder.manifest 2016-02-10 17:46:56.000000000 +0000 @@ -1,5 +1,5 @@ -# bzr-builder format 0.3 deb-version 0.201602091746 +# bzr-builder format 0.3 deb-version 0.201602101746 lp:~ubuntu-audio-dev/alsa-driver/dkms-packaging revid:hui.wang@canonical.com-20160202013304-j6xbcxjes5jqsfof -nest-part upstream_pci_hda lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 pci/hda hda-src-from-tree revid:david.henningsson@canonical.com-20160209120437-y1uk2gzx4yb3lxrl -nest-part upstream_hda_core lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 hda hda-src-from-tree/hdacore revid:david.henningsson@canonical.com-20160209120437-y1uk2gzx4yb3lxrl -nest-part upstream_include lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 include include-src-from-tree revid:david.henningsson@canonical.com-20160209120437-y1uk2gzx4yb3lxrl +nest-part upstream_pci_hda lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 pci/hda hda-src-from-tree revid:david.henningsson@canonical.com-20160209230438-699u5f5l3juox4vs +nest-part upstream_hda_core lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 hda hda-src-from-tree/hdacore revid:david.henningsson@canonical.com-20160209230438-699u5f5l3juox4vs +nest-part upstream_include lp:~ubuntu-audio-dev/alsa-driver/tiwai-trunk2 include include-src-from-tree revid:david.henningsson@canonical.com-20160209230438-699u5f5l3juox4vs diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/debian/changelog oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/debian/changelog --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/debian/changelog 2016-02-09 17:46:39.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/debian/changelog 2016-02-10 17:46:56.000000000 +0000 @@ -1,8 +1,8 @@ -oem-audio-hda-daily-dkms (0.201602091746~ubuntu14.04.1) trusty; urgency=low +oem-audio-hda-daily-dkms (0.201602101746~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Launchpad Package Builder Tue, 09 Feb 2016 17:46:39 +0000 + -- Launchpad Package Builder Wed, 10 Feb 2016 17:46:56 +0000 oem-audio-hda-daily-dkms (0.1) trusty; urgency=low diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/hda_generic.c oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/hda_generic.c --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/hda_generic.c 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/hda_generic.c 2016-02-10 17:46:53.000000000 +0000 @@ -4028,9 +4028,9 @@ struct hda_jack_callback *jack, bool on) { - if (jack && jack->tbl->nid) + if (jack && jack->nid) sync_power_state_change(codec, - set_pin_power_jack(codec, jack->tbl->nid, on)); + set_pin_power_jack(codec, jack->nid, on)); } /* callback only doing power up -- called at first */ diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/hda_jack.c oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/hda_jack.c --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/hda_jack.c 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/hda_jack.c 2016-02-10 17:46:53.000000000 +0000 @@ -259,7 +259,7 @@ if (!callback) return ERR_PTR(-ENOMEM); callback->func = func; - callback->tbl = jack; + callback->nid = jack->nid; callback->next = jack->callback; jack->callback = callback; } diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/hda_jack.h oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/hda_jack.h --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/hda_jack.h 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/hda_jack.h 2016-02-10 17:46:53.000000000 +0000 @@ -21,7 +21,7 @@ typedef void (*hda_jack_callback_fn) (struct hda_codec *, struct hda_jack_callback *); struct hda_jack_callback { - struct hda_jack_tbl *tbl; + hda_nid_t nid; hda_jack_callback_fn func; unsigned int private_data; /* arbitrary data */ struct hda_jack_callback *next; diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_ca0132.c oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_ca0132.c --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_ca0132.c 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_ca0132.c 2016-02-10 17:46:53.000000000 +0000 @@ -4427,13 +4427,16 @@ static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb) { struct ca0132_spec *spec = codec->spec; + struct hda_jack_tbl *tbl; /* Delay enabling the HP amp, to let the mic-detection * state machine run. */ cancel_delayed_work_sync(&spec->unsol_hp_work); schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500)); - cb->tbl->block_report = 1; + tbl = snd_hda_jack_tbl_get(codec, cb->nid); + if (tbl) + tbl->block_report = 1; } static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb) diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_hdmi.c oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_hdmi.c --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_hdmi.c 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_hdmi.c 2016-02-10 17:46:53.000000000 +0000 @@ -1194,7 +1194,7 @@ static void jack_callback(struct hda_codec *codec, struct hda_jack_callback *jack) { - check_presence_and_report(codec, jack->tbl->nid); + check_presence_and_report(codec, jack->nid); } static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_realtek.c oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_realtek.c --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_realtek.c 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_realtek.c 2016-02-10 17:46:53.000000000 +0000 @@ -282,7 +282,7 @@ uctl = kzalloc(sizeof(*uctl), GFP_KERNEL); if (!uctl) return; - val = snd_hda_codec_read(codec, jack->tbl->nid, 0, + val = snd_hda_codec_read(codec, jack->nid, 0, AC_VERB_GET_VOLUME_KNOB_CONTROL, 0); val &= HDA_AMP_VOLMASK; uctl->value.integer.value[0] = val; diff -Nru oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_sigmatel.c oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_sigmatel.c --- oem-audio-hda-daily-dkms-0.201602091746~ubuntu14.04.1/hda-src-from-tree/patch_sigmatel.c 2016-02-09 17:46:36.000000000 +0000 +++ oem-audio-hda-daily-dkms-0.201602101746~ubuntu14.04.1/hda-src-from-tree/patch_sigmatel.c 2016-02-10 17:46:53.000000000 +0000 @@ -493,9 +493,9 @@ if (!spec->num_pwrs) return; - if (jack && jack->tbl->nid) { - stac_toggle_power_map(codec, jack->tbl->nid, - snd_hda_jack_detect(codec, jack->tbl->nid), + if (jack && jack->nid) { + stac_toggle_power_map(codec, jack->nid, + snd_hda_jack_detect(codec, jack->nid), true); return; }