mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
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
This commit is contained in:
commit
6d242a2636
5 changed files with 2 additions and 8 deletions
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue