Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9691cea9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net: seeq: fix timer conversion 



One of the timer conversion patches evidently escaped build testing
until I ran into in on ARM randconfig builds:

drivers/net/ethernet/seeq/ether3.c: In function 'ether3_ledoff':
drivers/net/ethernet/seeq/ether3.c:175:40: error: 'priv' undeclared (first use in this function); did you mean 'pid'?
drivers/net/ethernet/seeq/ether3.c:176:27: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]

This fixes the two small typos that caused the problems.

Fixes: 6fd9c53f ("net: seeq: Convert timers to use timer_setup()")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b35be415

drivers/net/ethernet/seeq/ether3.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ ether3_setbuffer(struct net_device *dev, buffer_rw_t read, int start) 
 */

static void ether3_ledoff(struct timer_list *t)

{

	struct dev_priv *private = from_timer(priv, t, timer);

	struct dev_priv *private = from_timer(private, t, timer);

	struct net_device *dev = private->dev;



	ether3_outw(priv(dev)->regs.config2 |= CFG2_CTRLO, REG_CONFIG2);

drivers/net/ethernet/seeq/ether3.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct dev_priv { 
    unsigned char tx_tail;		/* buffer nr of transmitting packet	 */

    unsigned int rx_head;		/* address to fetch next packet from	 */

    struct timer_list timer;

    net_device *dev;

    struct net_device *dev;

    int broken;				/* 0 = ok, 1 = something went wrong	 */

};