diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 14:40:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-22 14:40:48 -0800 |
| commit | 0099f77e0a224cc461d0d2930ef0fdb32c61ba64 (patch) | |
| tree | c4f6252067f6d581779eba4039020279ce11c5f3 | |
| parent | 2e8569669805c2d2620527464c395279b74892fc (diff) | |
| parent | 9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325 (diff) | |
| download | linux-0099f77e0a224cc461d0d2930ef0fdb32c61ba64.tar.bz2 | |
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
| -rw-r--r-- | drivers/ide/cs5530.c | 3 | ||||
| -rw-r--r-- | drivers/ide/sc1200.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c index 53f079cc00af..d8ede85fe17f 100644 --- a/drivers/ide/cs5530.c +++ b/drivers/ide/cs5530.c @@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive) { ide_hwif_t *hwif = drive->hwif; ide_drive_t *mate = ide_get_pair_dev(drive); - u16 *mateid = mate->id; + u16 *mateid; u8 mask = hwif->ultra_mask; if (mate == NULL) goto out; + mateid = mate->id; if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { if ((mateid[ATA_ID_FIELD_VALID] & 4) && diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c index f1a8758e3a99..ec7f766ef5e4 100644 --- a/drivers/ide/sc1200.c +++ b/drivers/ide/sc1200.c @@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive) { ide_hwif_t *hwif = drive->hwif; ide_drive_t *mate = ide_get_pair_dev(drive); - u16 *mateid = mate->id; + u16 *mateid; u8 mask = hwif->ultra_mask; if (mate == NULL) goto out; + mateid = mate->id; if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { if ((mateid[ATA_ID_FIELD_VALID] & 4) && |