diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:57 -0400 |
commit | 794cc6804bb946826b7427d205ac391a5370d361 (patch) | |
tree | 7717c37c6cc8650a36408b8744df534191555918 /drivers/ide/ide-cd.c | |
parent | 5d41893c0f9caf94b449eada0279a08c86f0212e (diff) |
ide-{cd,floppy,tape}: remove checking for drive->scsi
Remove checking for drive->scsi which is no longer set by IDE core code
(leave the flag since it will be re-used for generic ATAPI support).
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 043129c422fe..d99847157186 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -2106,11 +2106,6 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
2106 | goto failed; | 2106 | goto failed; |
2107 | } | 2107 | } |
2108 | } | 2108 | } |
2109 | if (drive->scsi) { | ||
2110 | printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi " | ||
2111 | "emulation.\n", drive->name); | ||
2112 | goto failed; | ||
2113 | } | ||
2114 | info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL); | 2109 | info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL); |
2115 | if (info == NULL) { | 2110 | if (info == NULL) { |
2116 | printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", | 2111 | printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", |