Attachment #113123 for bug #231088

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

Lines 1330-1336 static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg) Link Here

(-)a/drivers/ata/ahci.c (-1 / +1 lines)
1330		1330
1331	rc = ahci_deinit_port(port_mmio, hpriv->cap, &emsg);	1331	rc = ahci_deinit_port(port_mmio, hpriv->cap, &emsg);
1332	if (rc == 0)	1332	if (rc == 0)
1333	ahci_power_down(port_mmio, hpriv->cap);	1333	/ahci_power_down(port_mmio, hpriv->cap)/;
1334	else {	1334	else {
1335	ata_port_printk(ap, KERN_ERR, "%s (%d)\n", emsg, rc);	1335	ata_port_printk(ap, KERN_ERR, "%s (%d)\n", emsg, rc);
1336	ahci_init_port(port_mmio, hpriv->cap,	1336	ahci_init_port(port_mmio, hpriv->cap,

Lines 40-46 static void power_down(suspend_disk_method_t mode) Link Here

(-)a/kernel/power/disk.c (-3 / +3 lines)
40	{	40	{
41	int error = 0;	41	int error = 0;
42		42
43	switch(mode) {	43	/*switch(mode) {
44	case PM_DISK_PLATFORM:	44	case PM_DISK_PLATFORM:
45	kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);	45	kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
46	error = pm_ops->enter(PM_SUSPEND_DISK);	46	error = pm_ops->enter(PM_SUSPEND_DISK);
Lines 51-58 static void power_down(suspend_disk_method_t mode) Link Here
51	case PM_DISK_REBOOT:	51	case PM_DISK_REBOOT:
52	kernel_restart(NULL);	52	kernel_restart(NULL);
53	break;	53	break;
54	}	54	}*/
55	kernel_halt();	55	//kernel_halt();
56	/* Valid image is on the disk, if we continue we risk serious data corruption	56	/* Valid image is on the disk, if we continue we risk serious data corruption
57	after resume. */	57	after resume. */
58	printk(KERN_CRIT "Please power me down manually\n");	58	printk(KERN_CRIT "Please power me down manually\n");

Return to bug 231088