1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index 60ab4b89a2f9..ef24837019d3 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
+ * $Id: cmdlinepart.c,v 1.18 2005/06/07 15:04:26 joern Exp $
  *
  * Read flash partition table from command line
  *
@@ -239,7 +239,8 @@ static int mtdpart_setup_real(char *s)
                                 &num_parts,     /* out: number of parts */
                                 0,              /* first partition */
                                 (unsigned char**)&this_mtd, /* out: extra mem */
-                                mtd_id_len + 1 + sizeof(*this_mtd));
+                                mtd_id_len + 1 + sizeof(*this_mtd) + 
+                                sizeof(void*)-1 /*alignment*/);
                 if(!parts)
                 {
                         /*
@@ -252,6 +253,9 @@ static int mtdpart_setup_real(char *s)
                          return 0;
                  }
 
+                /* align this_mtd */
+                this_mtd = (struct cmdline_mtd_partition *) 
+                        ALIGN((unsigned long)this_mtd, sizeof(void*));
                 /* enter results */         
                 this_mtd->parts = parts;
                 this_mtd->num_parts = num_parts;