diff mbox

mfd: ab8500-debugfs: move dereference after check for NULL

Message ID 20131113074030.GA25541@elgon.mountain (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Nov. 13, 2013, 7:40 a.m. UTC
We dereference "desc" before check if it is NULL.  I've shifted it
around so we check first before dereferencing.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
I am not able to compile this.

Comments

Linus Walleij Nov. 19, 2013, 8:07 a.m. UTC | #1
On Wed, Nov 13, 2013 at 8:40 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:

> We dereference "desc" before check if it is NULL.  I've shifted it
> around so we check first before dereferencing.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> I am not able to compile this.

Looks and compiles good.
Tested-by: Linus Walleij <linus.walleij@linaro.org>

Lee are you queueing this?

Yours,
Linus Walleij
Lee Jones Nov. 19, 2013, 8:24 a.m. UTC | #2
On Tue, 19 Nov 2013, Linus Walleij wrote:

> On Wed, Nov 13, 2013 at 8:40 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 
> > We dereference "desc" before check if it is NULL.  I've shifted it
> > around so we check first before dereferencing.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > I am not able to compile this.
> 
> Looks and compiles good.
> Tested-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Lee are you queueing this?

This one slipped through the net, thanks for bringing it to my attention.

Applied, thanks.
diff mbox

Patch

diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index e33e385..d1a22aa 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -1600,7 +1600,6 @@  static int ab8500_interrupts_print(struct seq_file *s, void *p)
 
 	for (line = 0; line < num_interrupt_lines; line++) {
 		struct irq_desc *desc = irq_to_desc(line + irq_first);
-		struct irqaction *action = desc->action;
 
 		seq_printf(s, "%3i:  %6i %4i", line,
 			   num_interrupts[line],
@@ -1608,7 +1607,9 @@  static int ab8500_interrupts_print(struct seq_file *s, void *p)
 
 		if (desc && desc->name)
 			seq_printf(s, "-%-8s", desc->name);
-		if (action) {
+		if (desc && desc->action) {
+			struct irqaction *action = desc->action;
+
 			seq_printf(s, "  %s", action->name);
 			while ((action = action->next) != NULL)
 				seq_printf(s, ", %s", action->name);