Merge tag 'pinctrl-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-microblaze.git] / sound / hda / ext / hdac_ext_bus.c

diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c
index a3a113e..4f9f1d2 100644 (file)
--- a/sound/hda/ext/hdac_ext_bus.c
+++ b/sound/hda/ext/hdac_ext_bus.c
@@ -85,7 +85,6 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,
                        const struct hdac_ext_bus_ops *ext_ops)
 {
        int ret;
-       static int idx;
 
        /* check if io ops are provided, if not load the defaults */
        if (io_ops == NULL)
@@ -96,7 +95,12 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,
                return ret;
 
        bus->ext_ops = ext_ops;
-       bus->idx = idx++;
+       /* FIXME:
+        * Currently only one bus is supported, if there is device with more
+        * buses, bus->idx should be greater than 0, but there needs to be a
+        * reliable way to always assign same number.
+        */
+       bus->idx = 0;
        bus->cmd_dma_state = true;
 
        return 0;