mtd: nand: omap2: fix error path

Submitted by Mohammed Afzal on Sept. 11, 2012, 6:28 a.m.

Details

Message ID 1347344934-28103-1-git-send-email-afzal@ti.com
State New, archived
Headers show

Commit Message

Mohammed Afzal Sept. 11, 2012, 6:28 a.m.
Let probe return error value if gpmc terminal
count interrupt could not be obtained

Signed-off-by: Afzal Mohammed <afzal@ti.com>
---
Hi,

My commit (now in l-o/devel-gpmc),

"bd4156f  mtd: nand: omap2: use gpmc provided irqs"

did not propogate error code properly due to
which this fix was required.

But this has not been mentioned in commit message
as it is not yet in mainline.

Regards
Afzal

 drivers/mtd/nand/omap2.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Mohammed Afzal Sept. 11, 2012, 6:30 a.m.
+Tony

On Tue, Sep 11, 2012 at 11:58:54, Mohammed, Afzal wrote:
> Let probe return error value if gpmc terminal
> count interrupt could not be obtained
> 
> Signed-off-by: Afzal Mohammed <afzal@ti.com>
> ---
> Hi,
> 
> My commit (now in l-o/devel-gpmc),
> 
> "bd4156f  mtd: nand: omap2: use gpmc provided irqs"
> 
> did not propogate error code properly due to
> which this fix was required.
> 
> But this has not been mentioned in commit message
> as it is not yet in mainline.
> 
> Regards
> Afzal
> 
>  drivers/mtd/nand/omap2.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> index 337cf0a..27293e3 100644
> --- a/drivers/mtd/nand/omap2.c
> +++ b/drivers/mtd/nand/omap2.c
> @@ -1404,6 +1404,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
>  		info->gpmc_irq_count = platform_get_irq(pdev, 1);
>  		if (info->gpmc_irq_count <= 0) {
>  			dev_err(&pdev->dev, "error getting count irq\n");
> +			err = -ENODEV;
>  			goto out_release_mem_region;
>  		}
>  		err = request_irq(info->gpmc_irq_count,	omap_nand_irq,
> -- 
> 1.7.0.4
> 
>
Tony Lindgren Sept. 11, 2012, 6:20 p.m.
* Mohammed, Afzal <afzal@ti.com> [120910 23:31]:
> +Tony
> 
> On Tue, Sep 11, 2012 at 11:58:54, Mohammed, Afzal wrote:
> > Let probe return error value if gpmc terminal
> > count interrupt could not be obtained

Thanks I'll just fold my fix and this fix into your original
patch and push them to new devel-gpmc-fixed branch because
of the copy paste UTF-8 issues in my fix.

Regards,

Tony

Patch hide | download patch | download mbox

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 337cf0a..27293e3 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1404,6 +1404,7 @@  static int __devinit omap_nand_probe(struct platform_device *pdev)
 		info->gpmc_irq_count = platform_get_irq(pdev, 1);
 		if (info->gpmc_irq_count <= 0) {
 			dev_err(&pdev->dev, "error getting count irq\n");
+			err = -ENODEV;
 			goto out_release_mem_region;
 		}
 		err = request_irq(info->gpmc_irq_count,	omap_nand_irq,