Patchwork [1/4] mtd/sst25l: check for null consistently

login
register
mail settings
Submitter Andrew Morton
Date July 20, 2010, 10:23 p.m.
Message ID <201007202224.o6KMO0oR021381@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/59381/
State New
Headers show

Comments

Andrew Morton - July 20, 2010, 10:23 p.m.
From: Dan Carpenter <error27@gmail.com>

The rest of the function assumes that "data" can be null.  I don't know
the code well enough to say whether it can actually be null, but there is
no harm in checking here.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: Andre Renaud <andre@bluewatersys.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mtd/devices/sst25l.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Artem Bityutskiy - July 21, 2010, 10:34 a.m.
On Tue, 2010-07-20 at 15:23 -0700, akpm@linux-foundation.org wrote:
> From: Dan Carpenter <error27@gmail.com>
> 
> The rest of the function assumes that "data" can be null.  I don't know
> the code well enough to say whether it can actually be null, but there is
> no harm in checking here.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
> Cc: Andre Renaud <andre@bluewatersys.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

This patch is also in my l2-mtd-2.6 / master tree.

The tree: http://git.infradead.org/users/dedekind/l2-mtd-2.6.git
Andrew Morton - July 21, 2010, 5:16 p.m.
On Wed, 21 Jul 2010 13:34:12 +0300 Artem Bityutskiy <Artem.Bityutskiy@nokia.com> wrote:

> On Tue, 2010-07-20 at 15:23 -0700, akpm@linux-foundation.org wrote:
> > From: Dan Carpenter <error27@gmail.com>
> > 
> > The rest of the function assumes that "data" can be null.  I don't know
> > the code well enough to say whether it can actually be null, but there is
> > no harm in checking here.
> > 
> > Signed-off-by: Dan Carpenter <error27@gmail.com>
> > Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
> > Cc: Andre Renaud <andre@bluewatersys.com>
> > Cc: David Woodhouse <dwmw2@infradead.org>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> This patch is also in my l2-mtd-2.6 / master tree.
> 
> The tree: http://git.infradead.org/users/dedekind/l2-mtd-2.6.git

Can we add that tree to linux-next?
Artem Bityutskiy - July 21, 2010, 6:10 p.m.
On Wed, 2010-07-21 at 10:16 -0700, Andrew Morton wrote:
> On Wed, 21 Jul 2010 13:34:12 +0300 Artem Bityutskiy <Artem.Bityutskiy@nokia.com> wrote:
> 
> > On Tue, 2010-07-20 at 15:23 -0700, akpm@linux-foundation.org wrote:
> > > From: Dan Carpenter <error27@gmail.com>
> > > 
> > > The rest of the function assumes that "data" can be null.  I don't know
> > > the code well enough to say whether it can actually be null, but there is
> > > no harm in checking here.
> > > 
> > > Signed-off-by: Dan Carpenter <error27@gmail.com>
> > > Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
> > > Cc: Andre Renaud <andre@bluewatersys.com>
> > > Cc: David Woodhouse <dwmw2@infradead.org>
> > > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> > 
> > This patch is also in my l2-mtd-2.6 / master tree.
> > 
> > The tree: http://git.infradead.org/users/dedekind/l2-mtd-2.6.git
> 
> Can we add that tree to linux-next?

Well... This is not the first time you are requesting this :) Up to
dwmw2, but alternatively, he could just look at my tree more often.

Patch

diff -puN drivers/mtd/devices/sst25l.c~mtd-sst25l-check-for-null-consistently drivers/mtd/devices/sst25l.c
--- a/drivers/mtd/devices/sst25l.c~mtd-sst25l-check-for-null-consistently
+++ a/drivers/mtd/devices/sst25l.c
@@ -454,7 +454,7 @@  static int __init sst25l_probe(struct sp
 						  parts, nr_parts);
 		}
 
-	} else if (data->nr_parts) {
+	} else if (data && data->nr_parts) {
 		dev_warn(&spi->dev, "ignoring %d default partitions on %s\n",
 			 data->nr_parts, data->name);
 	}