X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmtd%2Fdevices%2Fslram.c;h=4dbcfcfd68fc45992dab5e8c65492bff487587a3;hb=2cf7311f007833d5818fc9241c09a372c0325a4a;hp=fd579ae45dab8489dfe2b1896406195f9b83cb8d;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index fd579ae45..4dbcfcfd6 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -1,6 +1,6 @@
 /*======================================================================
 
-  $Id: slram.c,v 1.31 2004/08/09 13:19:44 dwmw2 Exp $
+  $Id: slram.c,v 1.30 2003/05/20 21:03:08 dwmw2 Exp $
 
   This driver provides a method to access memory not used by the kernel
   itself (i.e. if the kernel commandline mem=xxx is used). To actually
@@ -98,7 +98,12 @@ int slram_erase(struct mtd_info *mtd, struct erase_info *instr)
 
 	instr->state = MTD_ERASE_DONE;
 
-	mtd_erase_callback(instr);
+	if (instr->callback) {
+		(*(instr->callback))(instr);
+	}
+	else {
+		kfree(instr);
+	}
 
 	return(0);
 }