Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / mtd / devices / doc2000.c

diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 90acf57c19bd29962197cf9ed83fa332e3888a4c..50de839c77a9edf410747ba963ae4c3c93d49156 100644 (file)
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -3,8 +3,6 @@
  * Linux driver for Disk-On-Chip 2000 and Millennium
  * (c) 1999 Machine Vision Holdings, Inc.
  * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org>
- *
- * $Id: doc2000.c,v 1.67 2005/11/07 11:14:24 gleixner Exp $
  */
 
 #include <linux/kernel.h>
@@ -632,7 +630,7 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,
                        len = ((from | 0x1ff) + 1) - from;
 
                /* The ECC will not be calculated correctly if less than 512 is read */
-               if (len != 0x200 && eccbuf)
+               if (len != 0x200)
                        printk(KERN_WARNING
                               "ECC needs a full sector read (adr: %lx size %lx)\n",
                               (long) from, (long) len);
@@ -896,7 +894,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
                /* Let the caller know we completed it */
                *retlen += len;
 
-               if (eccbuf) {
+               {
                        unsigned char x[8];
                        size_t dummy;
                        int ret;