Merge branch 'for-linus' into for-2.6.33

[mv-sheeva.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index bb30f0e92d4df1cd5de977a977e933fec1f6eb26..9ad5ccc4c5eeca51408eef4bbfc1da33a7c8d532 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1053,9 +1053,7 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
                return count;
 
        strlcpy(elevator_name, name, sizeof(elevator_name));
-       strstrip(elevator_name);
-
-       e = elevator_get(elevator_name);
+       e = elevator_get(strstrip(elevator_name));
        if (!e) {
                printk(KERN_ERR "elevator: type %s not found\n", elevator_name);
                return -EINVAL;