diff options
| author | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
| commit | d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca (patch) | |
| tree | 1df8ab92fd228598d5884db37cceddcb18a0c020 /drivers/net | |
| parent | ee860c60d2c5283c009f7ea740c6ee706da87cb7 (diff) | |
| parent | fb5368789a45ca5ee4396cbbf563a8f16ab24f9c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fm/fm.h | 3 | ||||
| -rw-r--r-- | drivers/net/fm/init.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index 43de114b52..316e06e17e 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -143,6 +143,7 @@ struct fm_eth { #define MAX_RXBUF_LOG2 11 #define MAX_RXBUF_LEN (1 << MAX_RXBUF_LOG2) -#define PORT_IS_ENABLED(port) fm_info[fm_port_to_index(port)].enabled +#define PORT_IS_ENABLED(port) (fm_port_to_index(port) == -1 ? \ + 0 : fm_info[fm_port_to_index(port)].enabled) #endif /* __FM_H__ */ diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index cd787f4eed..ff04695c32 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -147,6 +147,9 @@ void fm_disable_port(enum fm_port port) { int i = fm_port_to_index(port); + if (i == -1) + return; + fm_info[i].enabled = 0; fman_disable_port(port); } @@ -155,6 +158,9 @@ void fm_enable_port(enum fm_port port) { int i = fm_port_to_index(port); + if (i == -1) + return; + fm_info[i].enabled = 1; fman_enable_port(port); } |