Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / kempld-core.c

diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 20a6afcfb36cf63c6e1ae8ccf6dc08db791dc491..07692604e119123a1f9b311b2611c5d0103daa78 100644 (file)
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -322,9 +322,12 @@ static int kempld_detect_device(struct kempld_device_data *pld)
                return -ENODEV;
        }
 
-       /* Release hardware mutex if aquired */
-       if (!(index_reg & KEMPLD_MUTEX_KEY))
+       /* Release hardware mutex if acquired */
+       if (!(index_reg & KEMPLD_MUTEX_KEY)) {
                iowrite8(KEMPLD_MUTEX_KEY, pld->io_index);
+               /* PXT and COMe-cPC2 boards may require a second release */
+               iowrite8(KEMPLD_MUTEX_KEY, pld->io_index);
+       }
 
        mutex_unlock(&pld->lock);