diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-16 07:33:21 +0200 |
commit | c91925db4925ba0d145478f02c093369196936e9 (patch) | |
tree | 0e5da4211de3c18b65337c3094ec15994cf2534a /drivers/s390 | |
parent | 977ddd6b2e63716cfefe669bbdb30ec0bcea1fe4 (diff) | |
parent | 3894335876a6257ac46e14845bd37ae6fb0f7c87 (diff) | |
download | op-kernel-dev-c91925db4925ba0d145478f02c093369196936e9.zip op-kernel-dev-c91925db4925ba0d145478f02c093369196936e9.tar.gz |
Merge branch 'fix/hda' into topic/hda
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 b7de025..85cf607 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; |