diff options
author | Herbert Valerio Riedel <hvr@inso.tuwien.ac.at> | 2005-01-17 08:47:24 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 05:19:46 -0400 |
commit | 8ea2e06fc8d2f03b49cef7732ae8e290e2f0b183 (patch) | |
tree | 455074eed205d8791f685795ec0b3833f54448e1 | |
parent | 14f8351a313f364afbc565f1ddcd43f8cfdccf52 (diff) |
[MTD] FTL Fix missing pointer assignment
For the case that mtd partitions are enabled it would cause a 0-pointer
dereferencing in mtdpart.c:mtd_erase_callback()
Signed-off-by: Herbert Valerio Riedel <hvr@inso.tuwien.ac.at>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | drivers/mtd/ftl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c index 18cc8846e733..d9ab60b36fd4 100644 --- a/drivers/mtd/ftl.c +++ b/drivers/mtd/ftl.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* This version ported to the Linux-MTD system by dwmw2@infradead.org | 1 | /* This version ported to the Linux-MTD system by dwmw2@infradead.org |
2 | * $Id: ftl.c,v 1.54 2004/11/16 18:33:15 dwmw2 Exp $ | 2 | * $Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $ |
3 | * | 3 | * |
4 | * Fixes: Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 4 | * Fixes: Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
5 | * - fixes some leaks on failure in build_maps and ftl_notify_add, cleanups | 5 | * - fixes some leaks on failure in build_maps and ftl_notify_add, cleanups |
@@ -357,6 +357,7 @@ static int erase_xfer(partition_t *part, | |||
357 | if (!erase) | 357 | if (!erase) |
358 | return -ENOMEM; | 358 | return -ENOMEM; |
359 | 359 | ||
360 | erase->mtd = part->mbd.mtd; | ||
360 | erase->callback = ftl_erase_callback; | 361 | erase->callback = ftl_erase_callback; |
361 | erase->addr = xfer->Offset; | 362 | erase->addr = xfer->Offset; |
362 | erase->len = 1 << part->header.EraseUnitSize; | 363 | erase->len = 1 << part->header.EraseUnitSize; |
@@ -1096,7 +1097,7 @@ struct mtd_blktrans_ops ftl_tr = { | |||
1096 | 1097 | ||
1097 | int init_ftl(void) | 1098 | int init_ftl(void) |
1098 | { | 1099 | { |
1099 | DEBUG(0, "$Id: ftl.c,v 1.54 2004/11/16 18:33:15 dwmw2 Exp $\n"); | 1100 | DEBUG(0, "$Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $\n"); |
1100 | 1101 | ||
1101 | return register_mtd_blktrans(&ftl_tr); | 1102 | return register_mtd_blktrans(&ftl_tr); |
1102 | } | 1103 | } |