Merge tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / net / wireless / ipw2x00 / ipw2200.c

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index edc3443..67cad9b 100644 (file)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -1363,7 +1363,7 @@ static ssize_t show_cmd_log(struct device *d,
        if (!priv->cmdlog)
                return 0;
        for (i = (priv->cmdlog_pos + 1) % priv->cmdlog_len;
-            (i != priv->cmdlog_pos) && (PAGE_SIZE - len);
+            (i != priv->cmdlog_pos) && (len < PAGE_SIZE);
             i = (i + 1) % priv->cmdlog_len) {
                len +=
                    snprintf(buf + len, PAGE_SIZE - len,