Commit 270868f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE power management bugfix from David S. Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: fix generic_ide_suspend/resume Oops
parents 7ca63ee1 9974e43d

drivers/ide/ide-pm.c

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


int generic_ide_suspend(struct device *dev, pm_message_t mesg)

{

	ide_drive_t *drive = dev_get_drvdata(dev);

	ide_drive_t *drive = to_ide_device(dev);

	ide_drive_t *pair = ide_get_pair_dev(drive);

	ide_hwif_t *hwif = drive->hwif;

	struct request *rq;
@@ -40,7 +40,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg) 


int generic_ide_resume(struct device *dev)

{

	ide_drive_t *drive = dev_get_drvdata(dev);

	ide_drive_t *drive = to_ide_device(dev);

	ide_drive_t *pair = ide_get_pair_dev(drive);

	ide_hwif_t *hwif = drive->hwif;

	struct request *rq;