Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / drivers / net / gianfar_sysfs.c

diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c
index 3724835..64f4094 100644 (file)
--- a/drivers/net/gianfar_sysfs.c
+++ b/drivers/net/gianfar_sysfs.c
@@ -24,7 +24,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
@@ -62,8 +61,8 @@ static ssize_t gfar_set_bd_stash(struct device *dev,
        /* Find out the new setting */
        if (!strncmp("on", buf, count - 1) || !strncmp("1", buf, count - 1))
                new_setting = 1;
-       else if (!strncmp("off", buf, count - 1)
-                || !strncmp("0", buf, count - 1))
+       else if (!strncmp("off", buf, count - 1) ||
+                !strncmp("0", buf, count - 1))
                new_setting = 0;
        else
                return count;
@@ -186,7 +185,7 @@ static ssize_t gfar_set_rx_stash_index(struct device *dev,
        temp = gfar_read(&regs->attreli);
        temp &= ~ATTRELI_EI_MASK;
        temp |= ATTRELI_EI(index);
-       gfar_write(&regs->attreli, flags);
+       gfar_write(&regs->attreli, temp);
 
 out:
        unlock_rx_qs(priv);