From 51f14f6c8e9fff30e745587253f81be011ea6142 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 5 Jun 2012 02:28:59 +0000 Subject: [PATCH] --- yaml --- r: 310877 b: refs/heads/master c: 027253c138a12b075e724f94b6cc43fd7071c14f h: refs/heads/master i: 310875: 5c76571d86889f11ca619f4f11bc3e93de65b628 v: v3 --- [refs] | 2 +- trunk/drivers/ide/icside.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cca86ace71a3..524a55df1646 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a527add871a51b3c06177849d18bf71e33b320 +refs/heads/master: 027253c138a12b075e724f94b6cc43fd7071c14f diff --git a/trunk/drivers/ide/icside.c b/trunk/drivers/ide/icside.c index 83e5100d73f6..bcb507b0cfd4 100644 --- a/trunk/drivers/ide/icside.c +++ b/trunk/drivers/ide/icside.c @@ -236,7 +236,7 @@ static const struct ide_port_ops icside_v6_no_dma_port_ops = { */ static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) { - unsigned long cycle_time; + unsigned long cycle_time = 0; int use_dma_info = 0; const u8 xfer_mode = drive->dma_mode; @@ -271,9 +271,9 @@ static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) ide_set_drivedata(drive, (void *)cycle_time); - printk("%s: %s selected (peak %dMB/s)\n", drive->name, - ide_xfer_verbose(xfer_mode), - 2000 / (unsigned long)ide_get_drivedata(drive)); + printk(KERN_INFO "%s: %s selected (peak %luMB/s)\n", + drive->name, ide_xfer_verbose(xfer_mode), + 2000 / (cycle_time ? cycle_time : (unsigned long) -1)); } static const struct ide_port_ops icside_v6_port_ops = {