Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[sfrench/cifs-2.6.git] / sound / soc / intel / skylake / skl.c

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 7ad8a75759bde79eca77f3c520963b5baea9f122..63182bfd794114120ef1fde927d468f090510a8a 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -361,7 +361,7 @@ static int skl_resume(struct device *dev)
        struct pci_dev *pci = to_pci_dev(dev);
        struct hdac_bus *bus = pci_get_drvdata(pci);
        struct skl_dev *skl  = bus_to_skl(bus);
-       struct hdac_ext_link *hlink = NULL;
+       struct hdac_ext_link *hlink;
        int ret;
 
        /*
@@ -794,7 +794,7 @@ static void skl_probe_work(struct work_struct *work)
 {
        struct skl_dev *skl = container_of(work, struct skl_dev, probe_work);
        struct hdac_bus *bus = skl_to_bus(skl);
-       struct hdac_ext_link *hlink = NULL;
+       struct hdac_ext_link *hlink;
        int err;
 
        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {