Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[sfrench/cifs-2.6.git] / drivers / net / wireless / ath / ath11k / ahb.c

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index 920abce9053a55069987fc3f707bb6d71cf09dda..b549576d0b51351b6c926bc18dfcce4964e8cf94 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -874,11 +874,11 @@ static int ath11k_ahb_setup_msi_resources(struct ath11k_base *ab)
        ab->pci.msi.ep_base_data = int_prop + 32;
 
        for (i = 0; i < ab->pci.msi.config->total_vectors; i++) {
-               res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
-               if (!res)
-                       return -ENODEV;
+               ret = platform_get_irq(pdev, i);
+               if (ret < 0)
+                       return ret;
 
-               ab->pci.msi.irqs[i] = res->start;
+               ab->pci.msi.irqs[i] = ret;
        }
 
        set_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &ab->dev_flags);
@@ -1174,7 +1174,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev)
                 * to a new space for accessing them.
                 */
                ab->mem_ce = ioremap(ce_remap->base, ce_remap->size);
-               if (IS_ERR(ab->mem_ce)) {
+               if (!ab->mem_ce) {
                        dev_err(&pdev->dev, "ce ioremap error\n");
                        ret = -ENOMEM;
                        goto err_core_free;