mtd/drivers/mtd/nand nand_base.c,1.144,1.145

[gleixner at infradead.org]

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

Modified Files:
	nand_base.c 
Log Message:
Grmbl

Index: nand_base.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_base.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- nand_base.c	31 May 2005 19:39:16 -0000	1.144
+++ nand_base.c	31 May 2005 20:32:53 -0000	1.145
@@ -762,7 +762,7 @@
 	wait_queue_head_t *wq;
 	DECLARE_WAITQUEUE (wait, current);
 
-	lock = (this->controller) ? &this->controller->lock : &this->lock;
+	lock = (this->controller) ? &this->controller->lock : &this->chip_lock;
 	wq = (this->controller) ? &this->controller->wq : &this->wq;
 retry:
 	active = this;