On Thu, Jul 26, 2012 at 02:54:01PM +0400, Sergei Shtylyov wrote: > Hello. > > On 26-07-2012 14:05, Aaron Lu wrote: > > >When the ODD is resumed, disk_unblock_events should be called when: > >1 The ODD is runtime resumed; > >2 System is resuming from S3 and the ODD is runtime suspended before S3; > >But not when the system is resuming from S3 and the ODD is runtime > >active before S3. > > >So seperate the resume calls, one for system resume and one for runtime > >resume to do different things accordingly. > > >Signed-off-by: Aaron Lu <aaron.lu@xxxxxxx> > >--- > > drivers/scsi/sr.c | 21 +++++++++++++++++++++ > > 1 file changed, 21 insertions(+) > > >diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c > >index fd1c2f6..b8c2f9d 100644 > >--- a/drivers/scsi/sr.c > >+++ b/drivers/scsi/sr.c > [...] > >@@ -211,6 +217,21 @@ static int sr_suspend(struct device *dev, pm_message_t msg) > > > > static int sr_resume(struct device *dev) > > { > >+ struct scsi_cd *cd = dev_get_drvdata(dev); > >+ > >+ /* > >+ * If ODD is runtime suspended before system pm, unblock disk > >+ * events now since on system resume, we will fully resume it > > Comma not needed. Thanks. > > >+ * and set its rumtime status to active. > > s/rumtime/runtime/. Nice typo. %-) Thanks, and I'll use a spell checker next time to avoid such mistakes. -Aaron -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html