# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/03/24 13:07:52-05:00 jgarzik@redhat.com # [libata] Fix probing bug in VIA, SiS drivers # # Some 2.6 code leaked into the 2.4 backport. # # Spotted by Sergey Vlasov. # # drivers/scsi/sata_via.c # 2004/03/24 13:07:50-05:00 jgarzik@redhat.com +1 -3 # [libata] Fix probing bug in VIA, SiS drivers # # Some 2.6 code leaked into the 2.4 backport. # # Spotted by Sergey Vlasov. # # drivers/scsi/sata_sis.c # 2004/03/24 13:07:50-05:00 jgarzik@redhat.com +1 -3 # [libata] Fix probing bug in VIA, SiS drivers # # Some 2.6 code leaked into the 2.4 backport. # # Spotted by Sergey Vlasov. # diff -Nru a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c --- a/drivers/scsi/sata_sis.c Wed Mar 24 13:08:01 2004 +++ b/drivers/scsi/sata_sis.c Wed Mar 24 13:08:01 2004 @@ -182,9 +182,7 @@ pci_set_master(pdev); pci_enable_intx(pdev); - /* FIXME: check ata_device_add return value */ - ata_device_add(probe_ent); - kfree(probe_ent); + ata_add_to_probe_list(probe_ent); return 0; diff -Nru a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c --- a/drivers/scsi/sata_via.c Wed Mar 24 13:08:01 2004 +++ b/drivers/scsi/sata_via.c Wed Mar 24 13:08:01 2004 @@ -264,9 +264,7 @@ pci_set_master(pdev); - /* FIXME: check ata_device_add return value */ - ata_device_add(probe_ent); - kfree(probe_ent); + ata_add_to_probe_list(probe_ent); return 0;