--- zzzz-none-000/linux-2.6.19.2/drivers/block/cpqarray.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/block/cpqarray.c	2007-01-11 07:38:19.000000000 +0000
@@ -998,7 +998,6 @@
  */
 static inline void complete_command(cmdlist_t *cmd, int timeout)
 {
-	struct request *rq = cmd->rq;
 	int ok=1;
 	int i, ddir;
 
@@ -1030,18 +1029,12 @@
                 pci_unmap_page(hba[cmd->ctlr]->pci_dev, cmd->req.sg[i].addr,
 				cmd->req.sg[i].size, ddir);
 
-	complete_buffers(rq->bio, ok);
+	complete_buffers(cmd->rq->bio, ok);
 
-	if (blk_fs_request(rq)) {
-		const int rw = rq_data_dir(rq);
+	add_disk_randomness(cmd->rq->rq_disk);
 
-		disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
-	}
-
-	add_disk_randomness(rq->rq_disk);
-
-	DBGPX(printk("Done with %p\n", rq););
-	end_that_request_last(rq, ok ? 1 : -EIO);
+        DBGPX(printk("Done with %p\n", cmd->rq););
+	end_that_request_last(cmd->rq, ok ? 1 : -EIO);
 }
 
 /*