tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test

Linus Torvalds 0099f77e 2e856966

+4 -2
unified split
+2 -1
drivers/ide/cs5530.c
··· 81 { 82 ide_hwif_t *hwif = drive->hwif; 83 ide_drive_t *mate = ide_get_pair_dev(drive); 84 - u16 *mateid = mate->id; 85 u8 mask = hwif->ultra_mask; 86 87 if (mate == NULL) 88 goto out; 89 90 if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { 91 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
··· 81 { 82 ide_hwif_t *hwif = drive->hwif; 83 ide_drive_t *mate = ide_get_pair_dev(drive); 84 + u16 *mateid; 85 u8 mask = hwif->ultra_mask; 86 87 if (mate == NULL) 88 goto out; 89 + mateid = mate->id; 90 91 if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { 92 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
+2 -1
drivers/ide/sc1200.c
··· 104 { 105 ide_hwif_t *hwif = drive->hwif; 106 ide_drive_t *mate = ide_get_pair_dev(drive); 107 - u16 *mateid = mate->id; 108 u8 mask = hwif->ultra_mask; 109 110 if (mate == NULL) 111 goto out; 112 113 if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { 114 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
··· 104 { 105 ide_hwif_t *hwif = drive->hwif; 106 ide_drive_t *mate = ide_get_pair_dev(drive); 107 + u16 *mateid; 108 u8 mask = hwif->ultra_mask; 109 110 if (mate == NULL) 111 goto out; 112 + mateid = mate->id; 113 114 if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { 115 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&