diff options
| author | Takashi Iwai | 2016-09-11 09:33:12 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2016-09-11 09:33:12 +0200 |
| commit | 3d2f4d0c0d4f3b676ecca504a3916b8e9843a181 (patch) | |
| tree | f72e05df59734bb1deeba510283072e16c056640 /sound/soc/intel/skylake/skl.c | |
| parent | ALSA: hda - Skip Realtek SKU check for Lenovo machines (diff) | |
| parent | ALSA: hda - Fix headset mic detection problem for several Dell laptops (diff) | |
| download | kernel-qcow2-linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.tar.gz kernel-qcow2-linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.tar.xz kernel-qcow2-linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.zip | |
Merge branch 'for-linus' into for-next
Back-merge from for-linus just to make the further development easier.
Diffstat (limited to 'sound/soc/intel/skylake/skl.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index a893ca13be8e..2989c164dafe 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -672,8 +672,10 @@ static int skl_probe(struct pci_dev *pci, skl->nhlt = skl_nhlt_init(bus->dev); - if (skl->nhlt == NULL) + if (skl->nhlt == NULL) { + err = -ENODEV; goto out_free; + } skl_nhlt_update_topology_bin(skl); |