Skip to content

Commit

Permalink
net: seeq: fix timer conversion
Browse files Browse the repository at this point in the history
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: 6fd9c53 ("net: seeq: Convert timers to use timer_setup()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Arnd Bergmann authored and David S. Miller committed Nov 2, 2017
1 parent b35be41 commit 9691cea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/seeq/ether3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/seeq/ether3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
};

Expand Down

0 comments on commit 9691cea

Please sign in to comment.