diff options
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 410e1bac7815..6de31739b45c 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -716,7 +716,7 @@ static int gpmc_setup_irq(void) | |||
716 | return -EINVAL; | 716 | return -EINVAL; |
717 | 717 | ||
718 | gpmc_irq_start = irq_alloc_descs(-1, 0, GPMC_NR_IRQ, 0); | 718 | gpmc_irq_start = irq_alloc_descs(-1, 0, GPMC_NR_IRQ, 0); |
719 | if (IS_ERR_VALUE(gpmc_irq_start)) { | 719 | if (gpmc_irq_start < 0) { |
720 | pr_err("irq_alloc_descs failed\n"); | 720 | pr_err("irq_alloc_descs failed\n"); |
721 | return gpmc_irq_start; | 721 | return gpmc_irq_start; |
722 | } | 722 | } |
@@ -801,7 +801,7 @@ static int gpmc_mem_init(void) | |||
801 | continue; | 801 | continue; |
802 | gpmc_cs_get_memconf(cs, &base, &size); | 802 | gpmc_cs_get_memconf(cs, &base, &size); |
803 | rc = gpmc_cs_insert_mem(cs, base, size); | 803 | rc = gpmc_cs_insert_mem(cs, base, size); |
804 | if (IS_ERR_VALUE(rc)) { | 804 | if (rc < 0) { |
805 | while (--cs >= 0) | 805 | while (--cs >= 0) |
806 | if (gpmc_cs_mem_enabled(cs)) | 806 | if (gpmc_cs_mem_enabled(cs)) |
807 | gpmc_cs_delete_mem(cs); | 807 | gpmc_cs_delete_mem(cs); |
@@ -1370,14 +1370,14 @@ static int gpmc_probe(struct platform_device *pdev) | |||
1370 | GPMC_REVISION_MINOR(l)); | 1370 | GPMC_REVISION_MINOR(l)); |
1371 | 1371 | ||
1372 | rc = gpmc_mem_init(); | 1372 | rc = gpmc_mem_init(); |
1373 | if (IS_ERR_VALUE(rc)) { | 1373 | if (rc < 0) { |
1374 | clk_disable_unprepare(gpmc_l3_clk); | 1374 | clk_disable_unprepare(gpmc_l3_clk); |
1375 | clk_put(gpmc_l3_clk); | 1375 | clk_put(gpmc_l3_clk); |
1376 | dev_err(gpmc_dev, "failed to reserve memory\n"); | 1376 | dev_err(gpmc_dev, "failed to reserve memory\n"); |
1377 | return rc; | 1377 | return rc; |
1378 | } | 1378 | } |
1379 | 1379 | ||
1380 | if (IS_ERR_VALUE(gpmc_setup_irq())) | 1380 | if (gpmc_setup_irq() < 0) |
1381 | dev_warn(gpmc_dev, "gpmc_setup_irq failed\n"); | 1381 | dev_warn(gpmc_dev, "gpmc_setup_irq failed\n"); |
1382 | 1382 | ||
1383 | /* Now the GPMC is initialised, unreserve the chip-selects */ | 1383 | /* Now the GPMC is initialised, unreserve the chip-selects */ |