Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 93023
b: refs/heads/master
c: ed262c4
h: refs/heads/master
i:
  93021: 09db7fe
  93019: 2615885
  93015: eec3f25
  93007: b5b8eda
  92991: 24cbfcf
v: v3
  • Loading branch information
Adrian Bunk authored and David Woodhouse committed Apr 22, 2008
1 parent e693658 commit c29e25b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 456d9fc92eb8635d53e8facc57764464b8759173
refs/heads/master: ed262c4f5cb8291668c27c88a022bd7628f067a4
10 changes: 6 additions & 4 deletions trunk/drivers/mtd/cmdlinepart.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ static struct mtd_partition * newpart(char *s,
char *p;

name = ++s;
if ((p = strchr(name, delim)) == 0)
p = strchr(name, delim);
if (!p)
{
printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
return NULL;
Expand Down Expand Up @@ -159,9 +160,10 @@ static struct mtd_partition * newpart(char *s,
return NULL;
}
/* more partitions follow, parse them */
if ((parts = newpart(s + 1, &s, num_parts,
this_part + 1, &extra_mem, extra_mem_size)) == 0)
return NULL;
parts = newpart(s + 1, &s, num_parts, this_part + 1,
&extra_mem, extra_mem_size);
if (!parts)
return NULL;
}
else
{ /* this is the last partition: allocate space for all */
Expand Down

0 comments on commit c29e25b

Please sign in to comment.