---

yaml --- r: 210523 b: refs/heads/master c: 52cc2ee h: refs/heads/master i: 210521: f907762 210519: c4e4077 v: v3
git-mirror · Aug 23, 2010 · 1bede72 · 1bede72
1 parent c7b5cad
commit 1bede72
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dd531a03ad721b41911ddb32e6e0481404e7aaf
+refs/heads/master: 52cc2eef31587b22ce9fbe77b064a031a9613ab0
diff --git a/trunk/drivers/block/mg_disk.c b/trunk/drivers/block/mg_disk.c
@@ -974,8 +974,7 @@ static int mg_probe(struct platform_device *plat_dev)
 	host->breq->queuedata = host;
 
 	/* mflash is random device, thanx for the noop */
-	elevator_exit(host->breq->elevator);
-	err = elevator_init(host->breq, "noop");
+	err = elevator_change(host->breq, "noop");
 	if (err) {
 		printk(KERN_ERR "%s:%d (elevator_init) fail\n",
 				__func__, __LINE__);

diff --git a/trunk/drivers/s390/char/tape_block.c b/trunk/drivers/s390/char/tape_block.c
@@ -217,8 +217,7 @@ tapeblock_setup_device(struct tape_device * device)
 	if (!blkdat->request_queue)
 		return -ENOMEM;
 
-	elevator_exit(blkdat->request_queue->elevator);
-	rc = elevator_init(blkdat->request_queue, "noop");
+	rc = elevator_change(blkdat->request_queue, "noop");
 	if (rc)
 		goto cleanup_queue;