net: unix: fix inflight counting bug in garbage collector

[linux-2.6-omap-h63xx.git] / drivers / ieee1394 / ieee1394_core.c

diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index 36c747b277d0a2b66ab26b89da98a371ad549142..dcdb71a7718d304451b7aebaedf5bf1dfdd877c8 100644 (file)
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -242,7 +242,7 @@ int hpsb_bus_reset(struct hpsb_host *host)
 {
        if (host->in_bus_reset) {
                HPSB_NOTICE("%s called while bus reset already in progress",
-                           __FUNCTION__);
+                           __func__);
                return 1;
        }
 
@@ -373,6 +373,8 @@ static void build_speed_map(struct hpsb_host *host, int nodecount)
                        if (sid->port2 == SELFID_PORT_CHILD) cldcnt[n]++;
 
                        speedcap[n] = sid->speed;
+                       if (speedcap[n] > host->csr.lnk_spd)
+                               speedcap[n] = host->csr.lnk_spd;
                        n--;
                }
        }