From a3a4cc330d30c6f247c7ff6bae44c0a6b569f5be Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 26 Feb 2008 21:50:36 +0100 Subject: [PATCH] --- yaml --- r: 86411 b: refs/heads/master c: d12faa2736ebdee025a9aa07b2683c5fa8c86553 h: refs/heads/master i: 86409: ad2e84f51b5b612a4a4d2165868431c478d86756 86407: 182d0045e8e6f9aa804193293fa0f9af894a3460 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-disk.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b0c40229f34..63dddceea15a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbecebca1914f414008553b57aefde95b70f9142 +refs/heads/master: d12faa2736ebdee025a9aa07b2683c5fa8c86553 diff --git a/trunk/drivers/ide/ide-disk.c b/trunk/drivers/ide/ide-disk.c index 8f5bed471050..39501d130256 100644 --- a/trunk/drivers/ide/ide-disk.c +++ b/trunk/drivers/ide/ide-disk.c @@ -867,7 +867,7 @@ static void idedisk_setup (ide_drive_t *drive) /* Only print cache size when it was specified */ if (id->buf_size) - printk (" w/%dKiB Cache", id->buf_size/2); + printk(KERN_CONT " w/%dKiB Cache", id->buf_size / 2); printk(KERN_CONT ", CHS=%d/%d/%d\n", drive->bios_cyl, drive->bios_head, drive->bios_sect); @@ -949,7 +949,8 @@ static void ide_device_shutdown(ide_drive_t *drive) return; } - printk("Shutdown: %s\n", drive->name); + printk(KERN_INFO "Shutdown: %s\n", drive->name); + drive->gendev.bus->suspend(&drive->gendev, PMSG_SUSPEND); }