2.4: fix media type detection in ide-scsi
We are looking for IDE media types not for SCSI media.
BTW what is the purpose of loop over media types in idescsi_attach? The patch fixes media types there as well, but it does not appear to do anything useful.
regards
-andrey
drivers/scsi/ide-scsi.c renamed from usr/src/linux-2.4.21-0.pre3.1mdk/drivers/scsi/ide-scsi.c +19 -17
@@ -733,14 +733,12 @@int idescsi_attach (ide_drive_t *drive) {idescsi_scsi_t *scsi; -u8 media[] = {TYPE_DISK ,/* 0x00 */ -TYPE_TAPE ,/* 0x01 */ -TYPE_PRINTER ,/* 0x02 */ -TYPE_PROCESSOR ,/* 0x03 */ -TYPE_WORM ,/* 0x04 */ -TYPE_ROM ,/* 0x05 */ -TYPE_SCANNER ,/* 0x06 */ -TYPE_MOD ,/* 0x07 */ +u8 media[] = {/* ide_disk, we do not support IDE disks for now */ + ide_optical, + ide_cdrom, + ide_tape, + ide_floppy, +/* ide_scsi - should we scan for it as well? */ 255 };int i =0 , ret =0 , id =0 ;// int id = 2 * HWIF(drive)->index + drive->select.b.unit;
@@ -805,14 +803,12 @@#ifdef CLASSIC_BUILTINS_METHOD ide_drive_t *drive;idescsi_scsi_t *scsi; -u8 media[] = {TYPE_DISK ,/* 0x00 */ -TYPE_TAPE ,/* 0x01 */ -TYPE_PRINTER ,/* 0x02 */ -TYPE_PROCESSOR ,/* 0x03 */ -TYPE_WORM ,/* 0x04 */ -TYPE_ROM ,/* 0x05 */ -TYPE_SCANNER ,/* 0x06 */ -TYPE_MOD ,/* 0x07 */ +u8 media[] = {/* ide_disk, we do not support IDE disks for now */ + ide_optical, + ide_cdrom, + ide_tape, + ide_floppy, +/* ide_scsi - should we scan for it as well? */ 255 };int i, failed, id;
@@ -1133,7 +1129,13 @@ static void __exit exit_idescsi_module(void) {ide_drive_t *drive; -u8 media[] = {TYPE_DISK ,TYPE_TAPE ,TYPE_PROCESSOR ,TYPE_WORM ,TYPE_ROM ,TYPE_SCANNER ,TYPE_MOD ,255 }; +u8 media[] = {/* ide_disk, we do not support IDE disks for now */ + ide_optical, + ide_cdrom, + ide_tape, + ide_floppy, +/* ide_scsi - should we scan for it as well? */ +255 };int i, failed;scsi_unregister_module (MODULE_SCSI_HA , &idescsi_template);