diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /drivers/ide/ide-cd.c | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 49a8c589e346..f1489999cf91 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1933,6 +1933,7 @@ static void ide_cd_remove(ide_drive_t *drive) | |||
| 1933 | 1933 | ||
| 1934 | ide_proc_unregister_driver(drive, info->driver); | 1934 | ide_proc_unregister_driver(drive, info->driver); |
| 1935 | 1935 | ||
| 1936 | blk_unregister_filter(info->disk); | ||
| 1936 | del_gendisk(info->disk); | 1937 | del_gendisk(info->disk); |
| 1937 | 1938 | ||
| 1938 | ide_cd_put(info); | 1939 | ide_cd_put(info); |
| @@ -2158,6 +2159,7 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
| 2158 | g->fops = &idecd_ops; | 2159 | g->fops = &idecd_ops; |
| 2159 | g->flags |= GENHD_FL_REMOVABLE; | 2160 | g->flags |= GENHD_FL_REMOVABLE; |
| 2160 | add_disk(g); | 2161 | add_disk(g); |
| 2162 | blk_register_filter(g); | ||
| 2161 | return 0; | 2163 | return 0; |
| 2162 | 2164 | ||
| 2163 | out_free_cd: | 2165 | out_free_cd: |