2012-08-21 15:19:14

by Miklos Szeredi

Subject: [PATCH] ide: fix generic_ide_suspend/resume Oops

From: Miklos Szeredi <[email protected]>

This patch fixes a regresion introduced by commit 0998d063 (device-core: Ensure
drvdata = NULL when no driver is bound).

Suspend oopses in generic_ide_suspend() because dev_get_drvdata()
returns NULL (dev->p->driver_data == NULL) and this function is not
prepared for this.

Fix is based on Alan Stern's suggestion.

Signed-off-by: Miklos Szeredi <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
---
drivers/ide/ide-pm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index 9240609..8d1e32d 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -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;
--
1.7.7

2012-08-21 21:54:54

by David Miller

Subject: Re: [PATCH] ide: fix generic_ide_suspend/resume Oops

From: Miklos Szeredi <[email protected]>
Date: Tue, 21 Aug 2012 17:20:30 +0200

> From: Miklos Szeredi <[email protected]>
>
> This patch fixes a regresion introduced by commit 0998d063 (device-core: Ensure
> drvdata = NULL when no driver is bound).
>
> Suspend oopses in generic_ide_suspend() because dev_get_drvdata()
> returns NULL (dev->p->driver_data == NULL) and this function is not
> prepared for this.
>
> Fix is based on Alan Stern's suggestion.
>
> Signed-off-by: Miklos Szeredi <[email protected]>
> Acked-by: Rafael J. Wysocki <[email protected]>

Applied, thanks.