IDE fixes

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jun 16, 2007

Subsystems (2)

SCSI libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-06-16 00:17 UTC #0 lore raw

PATCH 1/1 IDE fixes

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/

to receive the following updates:

 drivers/ide/ide.c       |    9 ++++++---
 drivers/scsi/ide-scsi.c |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

Bartlomiej Zolnierkiewicz (1):
ide-scsi: fix OOPS in idescsi_expiry()

Rafael J. Wysocki (1):
Resume from RAM on HPC nx6325 broken

drivers/ide/ide.c +6 -3

index 0af0d16..0cd76bf 100644
@@ -1010,7 +1010,6 @@ static int generic_ide_resume(struct device *dev)
 {
 	ide_drive_t *drive = dev->driver_data;
 	ide_hwif_t *hwif = HWIF(drive);
-	ide_driver_t *drv = to_ide_driver(dev->driver);
 	struct request rq;
 	struct request_pm_state rqpm;
 	ide_task_t args;

@@ -1033,8 +1032,12 @@ static int generic_ide_resume(struct device *dev)
 
 	err = ide_do_drive_cmd(drive, &rq, ide_head_wait);
 
-	if (err == 0 && drv && drv->resume)
-		drv->resume(drive);
+	if (err == 0 && dev->driver) {
+		ide_driver_t *drv = to_ide_driver(dev->driver);
+
+		if (drv->resume)
+			drv->resume(drive);
+	}
 
 	return err;
 }

drivers/scsi/ide-scsi.c +1 -1

index 8263f75..bb90df8 100644
@@ -463,7 +463,7 @@ static inline unsigned long get_timeout(idescsi_pc_t *pc)
 
 static int idescsi_expiry(ide_drive_t *drive)
 {
-	idescsi_scsi_t *scsi = drive->driver_data;
+	idescsi_scsi_t *scsi = drive_to_idescsi(drive);
 	idescsi_pc_t   *pc   = scsi->pc;
 
 #if IDESCSI_DEBUG_LOG