[git pull] IDE fixes

[Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>]

Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
 drivers/ide/cs5530.c |    3 ++- drivers/ide/sc1200.c |    3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

Julia Lawall (1):      drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test

diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.cindex 53f079c..d8ede85 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.cindex f1a8758..ec7f766 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) &&ÿôèº{.nÇ+?·?®?­?+%?Ëÿ±éݶ¥?wÿº{.nÇ+?·¥?{±þ'^þ)í?æèw*jg¬±¨¶????Ý¢jÿ¾«þG«?éÿ¢¸¢·¦j:+v?¨?wèjØm¶?ÿþø¯ù®w¥þ?àþf£¢·h??â?úÿ?Ù¥