Attachment #113081 for bug #231088

View | Details | Raw Unified | Return to bug 231088
Collapse All | Expand All

Lines 5265-5271 int ata_host_suspend(struct ata_host *host, pm_message_t mesg) Link Here

(-)a/drivers/ata/libata-core.c (-2 / +2 lines)
5265	{	5265	{
5266	int i, j, rc;	5266	int i, j, rc;
5267		5267
5268	rc = ata_host_request_pm(host, mesg, 0, ATA_EHI_QUIET, 1);	5268	rc = ata_host_request_pm(host, mesg, 0, 0/ATA_EHI_QUIET/, 1);
5269	if (rc)	5269	if (rc)
5270	goto fail;	5270	goto fail;
5271		5271
Lines 5311-5317 int ata_host_suspend(struct ata_host *host, pm_message_t mesg) Link Here
5311	void ata_host_resume(struct ata_host *host)	5311	void ata_host_resume(struct ata_host *host)
5312	{	5312	{
5313	ata_host_request_pm(host, PMSG_ON, ATA_EH_SOFTRESET,	5313	ata_host_request_pm(host, PMSG_ON, ATA_EH_SOFTRESET,
5314	ATA_EHI_NO_AUTOPSY \| ATA_EHI_QUIET, 0);	5314	ATA_EHI_NO_AUTOPSY/* \| ATA_EHI_QUIET*/, 0);
5315	host->dev->power.power_state = PMSG_ON;	5315	host->dev->power.power_state = PMSG_ON;
5316	}	5316	}
5317		5317

Lines 473-479 int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t mesg) Link Here

(-)a/drivers/ata/libata-scsi.c (-2 / +2 lines)
473	if (mesg.event != PM_EVENT_SUSPEND)	473	if (mesg.event != PM_EVENT_SUSPEND)
474	action \|= ATA_EH_PM_FREEZE;	474	action \|= ATA_EH_PM_FREEZE;
475	ap->eh_info.dev_action[dev->devno] \|= action;	475	ap->eh_info.dev_action[dev->devno] \|= action;
476	ap->eh_info.flags \|= ATA_EHI_QUIET;	476	/ap->eh_info.flags \|= ATA_EHI_QUIET;/
477	ata_port_schedule_eh(ap);	477	ata_port_schedule_eh(ap);
478		478
479	spin_unlock_irqrestore(ap->lock, flags);	479	spin_unlock_irqrestore(ap->lock, flags);
Lines 543-549 int ata_scsi_device_resume(struct scsi_device *sdev) Link Here
543	* those if we're the only device on this link.	543	* those if we're the only device on this link.
544	*/	544	*/
545	if (ata_port_max_devices(ap) == 1)	545	if (ata_port_max_devices(ap) == 1)
546	ehi->flags \|= ATA_EHI_NO_AUTOPSY \| ATA_EHI_QUIET;	546	ehi->flags \|= ATA_EHI_NO_AUTOPSY/* \| ATA_EHI_QUIET*/;
547		547
548	ata_port_schedule_eh(ap);	548	ata_port_schedule_eh(ap);
549		549

Return to bug 231088