diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-07 04:11:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-07 04:11:17 +0200 |
| commit | 12e94471b2be5ef9b55b10004a3a2cd819490036 (patch) | |
| tree | f84ae818687dc7c35bd54f11bfb9717278d28a4e /drivers/s390 | |
| parent | caif: fix two caif_connect() bugs (diff) | |
| parent | Linux 2.6.36-rc7 (diff) | |
| download | linux-12e94471b2be5ef9b55b10004a3a2cd819490036.tar.xz linux-12e94471b2be5ef9b55b10004a3a2cd819490036.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/tape_block.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index b7de02525ec9..85cf607fc78f 100644 --- a/drivers/s390/char/tape_block.c +++ b/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; |