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, 4 insertions, 4 deletions

diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index f3a0b6a4b54e..8c03a80b482d 100644
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -1179,7 +1179,7 @@ static int knav_queue_setup_link_ram(struct knav_device *kdev)
 
                 block++;
                 if (!block->size)
-                        return 0;
+                        continue;
 
                 dev_dbg(kdev->dev, "linkram1: phys:%x, virt:%p, size:%x\n",
                         block->phys, block->virt, block->size);
@@ -1519,9 +1519,9 @@ static int knav_queue_load_pdsp(struct knav_device *kdev,
 
         for (i = 0; i < ARRAY_SIZE(knav_acc_firmwares); i++) {
                 if (knav_acc_firmwares[i]) {
-                        ret = request_firmware(&fw,
-                                               knav_acc_firmwares[i],
-                                               kdev->dev);
+                        ret = request_firmware_direct(&fw,
+                                                      knav_acc_firmwares[i],
+                                                      kdev->dev);
                         if (!ret) {
                                 found = true;
                                 break;