* [PATCH] ide: fix generic_ide_suspend/resume Oops
@ 2012-08-21 15:20 Miklos Szeredi
2012-08-21 21:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Miklos Szeredi @ 2012-08-21 15:20 UTC (permalink / raw)
To: davem; +Cc: rjw, stern, hdegoede, linux-kernel, linux-pm, linux-ide
From: Miklos Szeredi <mszeredi@suse.cz>
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 <mszeredi@suse.cz>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ide: fix generic_ide_suspend/resume Oops
2012-08-21 15:20 [PATCH] ide: fix generic_ide_suspend/resume Oops Miklos Szeredi
@ 2012-08-21 21:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-08-21 21:54 UTC (permalink / raw)
To: miklos; +Cc: rjw, stern, hdegoede, linux-kernel, linux-pm, linux-ide
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Tue, 21 Aug 2012 17:20:30 +0200
> From: Miklos Szeredi <mszeredi@suse.cz>
>
> 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 <mszeredi@suse.cz>
> Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-21 21:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-21 15:20 [PATCH] ide: fix generic_ide_suspend/resume Oops Miklos Szeredi
2012-08-21 21:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).