Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd61294 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

[MTD] DiskOnChip: Wait for the command to finish. 



Do not use the ready function here, as it might hang for ever. 
The result will show, whether the chip is there or not

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent fdf2fd52

drivers/mtd/nand/diskonchip.c

+9 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 *  

 * Interface to generic NAND code for M-Systems DiskOnChip devices

 *

 * $Id: diskonchip.c,v 1.48 2005/01/31 22:22:21 gleixner Exp $

 * $Id: diskonchip.c,v 1.49 2005/02/22 21:48:21 gleixner Exp $

 */



#include <linux/kernel.h>
@@ -411,6 +411,11 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr) 
	this->write_byte(mtd, 0);

	doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);

	

	/* We cant' use dev_ready here, but at least we wait for the

	 * command to complete 

	 */

	udelay(50);

	

	ret = this->read_byte(mtd) << 8;

	ret |= this->read_byte(mtd);
@@ -429,6 +434,8 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr) 
		doc2000_write_byte(mtd, 0);

		doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);



		udelay(50);



		ident.dword = readl(docptr + DoC_2k_CDSN_IO);

		if (((ident.byte[0] << 8) | ident.byte[1]) == ret) {

			printk(KERN_INFO "DiskOnChip 2000 responds to DWORD access\n");