Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0099f77e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2e856966 9ecab6e5

drivers/ide/cs5530.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive) 
{

{

	ide_hwif_t *hwif = drive->hwif;

	ide_hwif_t *hwif = drive->hwif;

	ide_drive_t *mate = ide_get_pair_dev(drive);

	ide_drive_t *mate = ide_get_pair_dev(drive);

	u16 *mateid = mate->id;

	u16 *mateid;

	u8 mask = hwif->ultra_mask;

	u8 mask = hwif->ultra_mask;





	if (mate == NULL)

	if (mate == NULL)

		goto out;

		goto out;

	mateid = mate->id;





	if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {

	if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {

		if ((mateid[ATA_ID_FIELD_VALID] & 4) &&

		if ((mateid[ATA_ID_FIELD_VALID] & 4) &&

drivers/ide/sc1200.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive) 
{

{

	ide_hwif_t *hwif = drive->hwif;

	ide_hwif_t *hwif = drive->hwif;

	ide_drive_t *mate = ide_get_pair_dev(drive);

	ide_drive_t *mate = ide_get_pair_dev(drive);

	u16 *mateid = mate->id;

	u16 *mateid;

	u8 mask = hwif->ultra_mask;

	u8 mask = hwif->ultra_mask;





	if (mate == NULL)

	if (mate == NULL)

		goto out;

		goto out;

	mateid = mate->id;





	if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {

	if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {

		if ((mateid[ATA_ID_FIELD_VALID] & 4) &&

		if ((mateid[ATA_ID_FIELD_VALID] & 4) &&