diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /drivers/ide/ide-cd.c | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -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) | |||
| 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); | ||
| 1937 | del_gendisk(info->disk); | 1936 | del_gendisk(info->disk); |
| 1938 | 1937 | ||
| 1939 | ide_cd_put(info); | 1938 | ide_cd_put(info); |
| @@ -2159,7 +2158,6 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
| 2159 | g->fops = &idecd_ops; | 2158 | g->fops = &idecd_ops; |
| 2160 | g->flags |= GENHD_FL_REMOVABLE; | 2159 | g->flags |= GENHD_FL_REMOVABLE; |
| 2161 | add_disk(g); | 2160 | add_disk(g); |
| 2162 | blk_register_filter(g); | ||
| 2163 | return 0; | 2161 | return 0; |
| 2164 | 2162 | ||
| 2165 | out_free_cd: | 2163 | out_free_cd: |