diff --git a/[refs] b/[refs] index 7000dd83af95..0fcd3e7c78d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 355b659c87432a4e76160640625c47fcf9174e8d +refs/heads/master: 8c279598585e4992a41016bb973993ed15888cb3 diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c index 1975b619c86d..a847046c6e53 100644 --- a/trunk/block/elevator.c +++ b/trunk/block/elevator.c @@ -1059,9 +1059,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;