From c7cf31b6c713c7b930f35fa607ebaf2bc501ff92 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 1 Aug 2009 09:51:06 +0000 Subject: [PATCH] --- yaml --- r: 159304 b: refs/heads/master c: 39506a552b4b302540e1f9c6c93a122df353e57d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23c28a4dd764..4f4bb9d465d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88e7b76ef7cf939a0cf23a1902030211b20837fe +refs/heads/master: 39506a552b4b302540e1f9c6c93a122df353e57d diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 1f7f015442df..07c92f34d8d8 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -1297,7 +1297,8 @@ static void b44_chip_reset(struct b44 *bp, int reset_kind) switch (sdev->bus->bustype) { case SSB_BUSTYPE_SSB: bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE | - (((ssb_clockspeed(sdev->bus) + (B44_MDC_RATIO / 2)) / B44_MDC_RATIO) + (DIV_ROUND_CLOSEST(ssb_clockspeed(sdev->bus), + B44_MDC_RATIO) & MDIO_CTRL_MAXF_MASK))); break; case SSB_BUSTYPE_PCI: