From: Masahiro Yamada Date: Wed, 9 Nov 2016 04:35:27 +0000 (+0900) Subject: mtd: nand: denali: return error code from devm_request_irq() on error X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ebb8d06781f87f5c6c6e6bae42ab44ba0fe9012;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git mtd: nand: denali: return error code from devm_request_irq() on error The devm_request_irq() returns an appropriate error value when it fails. Use it instead of the fixed -ENODEV. While we are here, reword the comment to make it fit in a single line, fixing the misspelling of "initialization". Signed-off-by: Masahiro Yamada Reviewed-by: Marek Vasut Signed-off-by: Boris Brezillon --- diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 5b34d4a6dfa4..f636ac4222d0 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1451,14 +1451,12 @@ int denali_init(struct denali_nand_info *denali) denali_hw_init(denali); denali_drv_init(denali); - /* - * denali_isr register is done after all the hardware - * initilization is finished - */ - if (devm_request_irq(denali->dev, denali->irq, denali_isr, IRQF_SHARED, - DENALI_NAND_NAME, denali)) { + /* Request IRQ after all the hardware initialization is finished */ + ret = devm_request_irq(denali->dev, denali->irq, denali_isr, + IRQF_SHARED, DENALI_NAND_NAME, denali); + if (ret) { dev_err(denali->dev, "Unable to request IRQ\n"); - return -ENODEV; + return ret; } /* now that our ISR is registered, we can enable interrupts */