mtd/drivers/mtd/nand nand_base.c,1.139,1.140

gleixner at infradead.org gleixner at infradead.org
Mon Apr 4 14:56:32 EDT 2005


Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv7955

Modified Files:
	nand_base.c 
Log Message:
Move the NULL check into the calling function

Index: nand_base.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_base.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- nand_base.c	4 Apr 2005 18:02:23 -0000	1.139
+++ nand_base.c	4 Apr 2005 18:56:29 -0000	1.140
@@ -1060,8 +1060,8 @@
  */
 static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)
 {
-	return nand_do_read_ecc (mtd, from, len, retlen, buf, NULL, NULL, 0xff);
-}			   
+	return nand_do_read_ecc (mtd, from, len, retlen, buf, NULL, &mtd->oobinfo, 0xff);
+}
 
 
 /**
@@ -1079,6 +1079,9 @@
 static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
 			  size_t * retlen, u_char * buf, u_char * oob_buf, struct nand_oobinfo *oobsel)
 {
+	/* use userspace supplied oobinfo, if zero */
+	if (oobsel == NULL)
+		oobsel = &mtd->oobinfo;
 	return nand_do_read_ecc(mtd, from, len, retlen, buf, oob_buf, oobsel, 0xff);
 }
 
@@ -1091,7 +1094,7 @@
  * @retlen:	pointer to variable to store the number of read bytes
  * @buf:	the databuffer to put data
  * @oob_buf:	filesystem supplied oob data buffer (can be NULL)
- * @oobsel:	oob selection structure (can be NULL)
+ * @oobsel:	oob selection structure
  * @flags:	flag to indicate if nand_get_device/nand_release_device should be preformed
  *		and how many corrected error bits are acceptable:
  *		  bits 0..7 - number of tolerable errors
@@ -1103,10 +1106,7 @@
 			     size_t * retlen, u_char * buf, u_char * oob_buf, 
 			     struct nand_oobinfo *oobsel, int flags)
 {
-	/* use userspace supplied oobinfo, if zero */
-	if (oobsel == NULL)
-		oobsel = &mtd->oobinfo;
-	
+
 	int i, j, col, realpage, page, end, ecc, chipnr, sndcmd = 1;
 	int read = 0, oob = 0, ecc_status = 0, ecc_failed = 0;
 	struct nand_chip *this = mtd->priv;





More information about the linux-mtd-cvs mailing list