From de6f7a04be09a28aed22f373e86a6f3e99327ab3 Mon Sep 17 00:00:00 2001 From: Roger While Date: Mon, 14 Nov 2005 11:50:46 +0100 Subject: [PATCH] --- yaml --- r: 14435 b: refs/heads/master c: cbf7c42b727826770a44c0a10ef3663da08e64bc h: refs/heads/master i: 14433: 366f50a0c74753010e3993c0ab013dede81ca2d5 14431: fd4f6ce1c1189bca10efdbea0ee8c7e8134c4473 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/prism54/isl_38xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14aae0e6ef26..cbc79db26188 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 344547093274c8bdb87becb939e5c8ab009ebfe6 +refs/heads/master: cbf7c42b727826770a44c0a10ef3663da08e64bc diff --git a/trunk/drivers/net/wireless/prism54/isl_38xx.c b/trunk/drivers/net/wireless/prism54/isl_38xx.c index 109a96d90007..23deee69974b 100644 --- a/trunk/drivers/net/wireless/prism54/isl_38xx.c +++ b/trunk/drivers/net/wireless/prism54/isl_38xx.c @@ -164,12 +164,12 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base) /* assert the Wakeup interrupt in the Device Interrupt Register */ isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_WAKEUP, ISL38XX_DEV_INT_REG); + +#if VERBOSE > SHOW_ERROR_MESSAGES udelay(ISL38XX_WRITEIO_DELAY); /* perform another read on the Device Status Register */ reg = readl(device_base + ISL38XX_CTRL_STAT_REG); - -#if VERBOSE > SHOW_ERROR_MESSAGES do_gettimeofday(¤t_time); DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", current_time.tv_sec, (long)current_time.tv_usec, reg);