diff options
Diffstat (limited to 'drivers/net/ethernet/renesas/ravb_main.c')
-rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index ee8d1ec61fab..467d41698fd5 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c | |||
@@ -905,6 +905,9 @@ static int ravb_phy_init(struct net_device *ndev) | |||
905 | netdev_info(ndev, "limited PHY to 100Mbit/s\n"); | 905 | netdev_info(ndev, "limited PHY to 100Mbit/s\n"); |
906 | } | 906 | } |
907 | 907 | ||
908 | /* 10BASE is not supported */ | ||
909 | phydev->supported &= ~PHY_10BT_FEATURES; | ||
910 | |||
908 | netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n", | 911 | netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n", |
909 | phydev->addr, phydev->irq, phydev->drv->name); | 912 | phydev->addr, phydev->irq, phydev->drv->name); |
910 | 913 | ||
@@ -1037,7 +1040,7 @@ static const char ravb_gstrings_stats[][ETH_GSTRING_LEN] = { | |||
1037 | "rx_queue_1_mcast_packets", | 1040 | "rx_queue_1_mcast_packets", |
1038 | "rx_queue_1_errors", | 1041 | "rx_queue_1_errors", |
1039 | "rx_queue_1_crc_errors", | 1042 | "rx_queue_1_crc_errors", |
1040 | "rx_queue_1_frame_errors_", | 1043 | "rx_queue_1_frame_errors", |
1041 | "rx_queue_1_length_errors", | 1044 | "rx_queue_1_length_errors", |
1042 | "rx_queue_1_missed_errors", | 1045 | "rx_queue_1_missed_errors", |
1043 | "rx_queue_1_over_errors", | 1046 | "rx_queue_1_over_errors", |
@@ -1225,7 +1228,7 @@ static int ravb_open(struct net_device *ndev) | |||
1225 | /* Device init */ | 1228 | /* Device init */ |
1226 | error = ravb_dmac_init(ndev); | 1229 | error = ravb_dmac_init(ndev); |
1227 | if (error) | 1230 | if (error) |
1228 | goto out_free_irq; | 1231 | goto out_free_irq2; |
1229 | ravb_emac_init(ndev); | 1232 | ravb_emac_init(ndev); |
1230 | 1233 | ||
1231 | /* Initialise PTP Clock driver */ | 1234 | /* Initialise PTP Clock driver */ |
@@ -1243,9 +1246,11 @@ static int ravb_open(struct net_device *ndev) | |||
1243 | out_ptp_stop: | 1246 | out_ptp_stop: |
1244 | /* Stop PTP Clock driver */ | 1247 | /* Stop PTP Clock driver */ |
1245 | ravb_ptp_stop(ndev); | 1248 | ravb_ptp_stop(ndev); |
1249 | out_free_irq2: | ||
1250 | if (priv->chip_id == RCAR_GEN3) | ||
1251 | free_irq(priv->emac_irq, ndev); | ||
1246 | out_free_irq: | 1252 | out_free_irq: |
1247 | free_irq(ndev->irq, ndev); | 1253 | free_irq(ndev->irq, ndev); |
1248 | free_irq(priv->emac_irq, ndev); | ||
1249 | out_napi_off: | 1254 | out_napi_off: |
1250 | napi_disable(&priv->napi[RAVB_NC]); | 1255 | napi_disable(&priv->napi[RAVB_NC]); |
1251 | napi_disable(&priv->napi[RAVB_BE]); | 1256 | napi_disable(&priv->napi[RAVB_BE]); |