summaryrefslogtreecommitdiffstats
path: root/drivers/ide/sc1200.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-12-22 23:05:06 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-12-22 23:05:06 +0100
commit9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325 (patch)
treebcf788b943c0050b06a30f69a940ae31fd69c6bf /drivers/ide/sc1200.c
parent3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff)
downloadop-kernel-dev-9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325.zip
op-kernel-dev-9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325.tar.gz
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
In each case, if the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/sc1200.c')
-rw-r--r--drivers/ide/sc1200.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
index 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) &&
OpenPOWER on IntegriCloud