From: Dmitry Torokhov <dmitry.torokhov@gmail.com> To: "G, Manjunath Kondaiah" <manjugk@ti.com> Cc: Ameya Palande <ameya.palande@nokia.com>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, Tony Lindgren <tony@atomide.com> Subject: Re: [PATCH v2] OMAP3: Keypad: Fix failure exit path in probe Date: Tue, 21 Sep 2010 09:26:58 -0700 [thread overview] Message-ID: <20100921162658.GA2310@core.coreip.homeip.net> (raw) In-Reply-To: <E0D41E29EB0DAC4E9F3FF173962E9E9402785A3478@dbde02.ent.ti.com> Hi, On Tue, Sep 21, 2010 at 07:11:01PM +0530, G, Manjunath Kondaiah wrote: > > Hi, > > > -----Original Message----- > > From: Ameya Palande [mailto:ameya.palande@nokia.com] > > Sent: Tuesday, September 21, 2010 7:04 PM > > To: G, Manjunath Kondaiah > > Cc: linux-omap@vger.kernel.org; linux-input@vger.kernel.org; > > Dmitry Torokhov; linux-arm-kernel@lists.infradead.org; Tony Lindgren > > Subject: Re: [PATCH v2] OMAP3: Keypad: Fix failure exit path in probe > > > > Hi Manjunath, > > > > On Tue, 2010-09-21 at 13:49 +0200, ext G, Manjunath Kondaiah wrote: > > > The failure exit paths seems to be wrong in probe function. > > > This patch corrects exit failure paths for error handling cases. > > And also adds memory leak... > > https://patchwork.kernel.org/patch/160551/ > > Any comments on this? > > Looks fine. Sorry, I didn't look at the change. This version seems to > be better. > I do not understand why we need to separate memory allocations. It looks like the minimal patch should be like one below. Thanks. -- Dmitry Input: twl4030_keypad - fix error handling path From: Dmitry Torokhov <dmitry.torokhov@gmail.com> We should not try to call free_irq() when request_irq() failed. Reported-by: G, Manjunath Kondaiah <manjugk@ti.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> --- drivers/input/keyboard/twl4030_keypad.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index fb16b5e..09bef79 100644 --- a/drivers/input/keyboard/twl4030_keypad.c +++ b/drivers/input/keyboard/twl4030_keypad.c @@ -406,23 +406,22 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev) if (error) { dev_info(kp->dbg_dev, "request_irq failed for irq no=%d\n", kp->irq); - goto err3; + goto err2; } /* Enable KP and TO interrupts now. */ reg = (u8) ~(KEYP_IMR1_KP | KEYP_IMR1_TO); if (twl4030_kpwrite_u8(kp, reg, KEYP_IMR1)) { error = -EIO; - goto err4; + goto err3; } platform_set_drvdata(pdev, kp); return 0; -err4: +err3: /* mask all events - we don't care about the result */ (void) twl4030_kpwrite_u8(kp, 0xff, KEYP_IMR1); -err3: free_irq(kp->irq, NULL); err2: input_unregister_device(input);
WARNING: multiple messages have this Message-ID (diff)
From: dmitry.torokhov@gmail.com (Dmitry Torokhov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] OMAP3: Keypad: Fix failure exit path in probe Date: Tue, 21 Sep 2010 09:26:58 -0700 [thread overview] Message-ID: <20100921162658.GA2310@core.coreip.homeip.net> (raw) In-Reply-To: <E0D41E29EB0DAC4E9F3FF173962E9E9402785A3478@dbde02.ent.ti.com> Hi, On Tue, Sep 21, 2010 at 07:11:01PM +0530, G, Manjunath Kondaiah wrote: > > Hi, > > > -----Original Message----- > > From: Ameya Palande [mailto:ameya.palande at nokia.com] > > Sent: Tuesday, September 21, 2010 7:04 PM > > To: G, Manjunath Kondaiah > > Cc: linux-omap at vger.kernel.org; linux-input at vger.kernel.org; > > Dmitry Torokhov; linux-arm-kernel at lists.infradead.org; Tony Lindgren > > Subject: Re: [PATCH v2] OMAP3: Keypad: Fix failure exit path in probe > > > > Hi Manjunath, > > > > On Tue, 2010-09-21 at 13:49 +0200, ext G, Manjunath Kondaiah wrote: > > > The failure exit paths seems to be wrong in probe function. > > > This patch corrects exit failure paths for error handling cases. > > And also adds memory leak... > > https://patchwork.kernel.org/patch/160551/ > > Any comments on this? > > Looks fine. Sorry, I didn't look at the change. This version seems to > be better. > I do not understand why we need to separate memory allocations. It looks like the minimal patch should be like one below. Thanks. -- Dmitry Input: twl4030_keypad - fix error handling path From: Dmitry Torokhov <dmitry.torokhov@gmail.com> We should not try to call free_irq() when request_irq() failed. Reported-by: G, Manjunath Kondaiah <manjugk@ti.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> --- drivers/input/keyboard/twl4030_keypad.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index fb16b5e..09bef79 100644 --- a/drivers/input/keyboard/twl4030_keypad.c +++ b/drivers/input/keyboard/twl4030_keypad.c @@ -406,23 +406,22 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev) if (error) { dev_info(kp->dbg_dev, "request_irq failed for irq no=%d\n", kp->irq); - goto err3; + goto err2; } /* Enable KP and TO interrupts now. */ reg = (u8) ~(KEYP_IMR1_KP | KEYP_IMR1_TO); if (twl4030_kpwrite_u8(kp, reg, KEYP_IMR1)) { error = -EIO; - goto err4; + goto err3; } platform_set_drvdata(pdev, kp); return 0; -err4: +err3: /* mask all events - we don't care about the result */ (void) twl4030_kpwrite_u8(kp, 0xff, KEYP_IMR1); -err3: free_irq(kp->irq, NULL); err2: input_unregister_device(input);
next prev parent reply other threads:[~2010-09-21 16:26 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-09-21 11:49 [PATCH v2] OMAP3: Keypad: Fix failure exit path in probe G, Manjunath Kondaiah 2010-09-21 13:34 ` Ameya Palande 2010-09-21 13:34 ` Ameya Palande 2010-09-21 13:41 ` G, Manjunath Kondaiah 2010-09-21 13:41 ` G, Manjunath Kondaiah 2010-09-21 16:26 ` Dmitry Torokhov [this message] 2010-09-21 16:26 ` Dmitry Torokhov 2010-09-22 9:08 ` G, Manjunath Kondaiah 2010-09-22 9:08 ` G, Manjunath Kondaiah 2010-10-04 8:02 ` G, Manjunath Kondaiah 2010-10-04 8:02 ` G, Manjunath Kondaiah 2010-10-04 18:28 ` Dmitry Torokhov 2010-10-04 18:28 ` Dmitry Torokhov 2010-10-04 18:52 ` G, Manjunath Kondaiah 2010-10-04 18:52 ` G, Manjunath Kondaiah 2010-09-24 11:30 ` Datta, Shubhrajyoti 2010-09-24 11:30 ` Datta, Shubhrajyoti 2010-09-24 11:40 ` G, Manjunath Kondaiah 2010-09-24 11:40 ` G, Manjunath Kondaiah 2010-09-24 15:35 ` Datta, Shubhrajyoti 2010-09-24 15:35 ` Datta, Shubhrajyoti
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100921162658.GA2310@core.coreip.homeip.net \ --to=dmitry.torokhov@gmail.com \ --cc=ameya.palande@nokia.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=manjugk@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.