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/block/mg_disk.c | |
| 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/block/mg_disk.c')
| -rw-r--r-- | drivers/block/mg_disk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index b82c5ce5e9df..76fa3deaee84 100644 --- a/drivers/block/mg_disk.c +++ b/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__); |