1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c
index e29978cf6197..0608d41fb6d0 100644
--- a/drivers/ide/umc8672.c
+++ b/drivers/ide/umc8672.c
@@ -106,22 +106,21 @@ static void umc_set_speeds(u8 speeds[])
 
 static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        ide_hwif_t *hwif = drive->hwif;
-        ide_hwgroup_t *mate_hwgroup = hwif->mate ? hwif->mate->hwgroup : NULL;
+        ide_hwif_t *hwif = drive->hwif, *mate = hwif->mate;
         unsigned long uninitialized_var(flags);
 
         printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
                 drive->name, pio, pio_to_umc[pio]);
-        if (mate_hwgroup)
-                spin_lock_irqsave(&mate_hwgroup->lock, flags);
-        if (mate_hwgroup && mate_hwgroup->handler) {
+        if (mate)
+                spin_lock_irqsave(&mate->lock, flags);
+        if (mate && mate->handler) {
                 printk(KERN_ERR "umc8672: other interface is busy: exiting tune_umc()\n");
         } else {
                 current_speeds[drive->name[2] - 'a'] = pio_to_umc[pio];
                 umc_set_speeds(current_speeds);
         }
-        if (mate_hwgroup)
-                spin_unlock_irqrestore(&mate_hwgroup->lock, flags);
+        if (mate)
+                spin_unlock_irqrestore(&mate->lock, flags);
 }
 
 static const struct ide_port_ops umc8672_port_ops = {