diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-11 08:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-11 08:42:55 -0700 |
| commit | 6d242a263618ba7f0f9a41dd91b347d19e704bbe (patch) | |
| tree | 1c532ca96d543bd2335a5915d9c7646ffe776eba /drivers/ide | |
| parent | a0a4a2cb0d69446c084792a40884d911dfc3cf27 (diff) | |
| parent | 2dc75d3c3b49c64fd26b4832a7efb75546cb3fc5 (diff) | |
| download | lwn-6d242a263618ba7f0f9a41dd91b347d19e704bbe.tar.gz lwn-6d242a263618ba7f0f9a41dd91b347d19e704bbe.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: disable sysfs parts of the disk command filter
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-cd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index f1489999cf91..49a8c589e346 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1933,7 +1933,6 @@ static void ide_cd_remove(ide_drive_t *drive) ide_proc_unregister_driver(drive, info->driver); - blk_unregister_filter(info->disk); del_gendisk(info->disk); ide_cd_put(info); @@ -2159,7 +2158,6 @@ static int ide_cd_probe(ide_drive_t *drive) g->fops = &idecd_ops; g->flags |= GENHD_FL_REMOVABLE; add_disk(g); - blk_register_filter(g); return 0; out_free_cd: |