Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 970781a9e677..f6a7161e3b85 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -1849,7 +1849,7 @@ static int xgbe_exit(struct xgbe_prv_data *pdata)
         usleep_range(10, 15);
 
         /* Poll Until Poll Condition */
-        while (count-- && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
+        while (--count && XGMAC_IOREAD_BITS(pdata, DMA_MR, SWR))
                 usleep_range(500, 600);
 
         if (!count)
@@ -1873,7 +1873,7 @@ static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata)
         /* Poll Until Poll Condition */
         for (i = 0; i < pdata->tx_q_count; i++) {
                 count = 2000;
-                while (count-- && XGMAC_MTL_IOREAD_BITS(pdata, i,
+                while (--count && XGMAC_MTL_IOREAD_BITS(pdata, i,
                                                         MTL_Q_TQOMR, FTQ))
                         usleep_range(500, 600);