Merge tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / drivers / staging / et131x / et131x.c

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index d329cf31436048598f6f0221de7ad4b586c58861..0901ef5d6e8ad4af2868c9f70b76d37513bfbfab 100644 (file)
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -762,6 +762,7 @@ static int et131x_init_eeprom(struct et131x_adapter *adapter)
         */
        if (eestatus & 0x4C) {
                int write_failed = 0;
+
                if (pdev->revision == 0x01) {
                        int     i;
                        static const u8 eedata[4] = { 0xFE, 0x13, 0x10, 0xFF };
@@ -2091,6 +2092,7 @@ static void et1310_disable_phy_coma(struct et131x_adapter *adapter)
 static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)
 {
        u32 tmp_free_buff_ring = *free_buff_ring;
+
        tmp_free_buff_ring++;
        /* This works for all cases where limit < 1024. The 1023 case
         * works because 1023++ is 1024 which means the if condition is not
@@ -4237,7 +4239,6 @@ static int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf,
 static int et131x_set_packet_filter(struct et131x_adapter *adapter)
 {
        int filter = adapter->packet_filter;
-       int status = 0;
        u32 ctrl;
        u32 pf_ctrl;
 
@@ -4288,7 +4289,7 @@ static int et131x_set_packet_filter(struct et131x_adapter *adapter)
                writel(pf_ctrl, &adapter->regs->rxmac.pf_ctrl);
                writel(ctrl, &adapter->regs->rxmac.ctrl);
        }
-       return status;
+       return 0;
 }
 
 /* et131x_multicast - The handler to configure multicasting on the interface */