Messages in this thread | | | Subject | Re: [PATCH v2] net: macb: undo operations in case of failure | From | Nicolas Ferre <> | Date | Thu, 18 Jun 2020 17:53:01 +0200 |
| |
On 18/06/2020 at 10:37, Claudiu Beznea wrote: > Undo previously done operation in case macb_phylink_connect() > fails. Since macb_reset_hw() is the 1st undo operation the > napi_exit label was renamed to reset_hw. > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Thanks Claudiu.
Regards, Nicolas
> --- > > Changes in v2: > - corrected fixes SHA1 > > drivers/net/ethernet/cadence/macb_main.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 67933079aeea..257c4920cb88 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -2558,7 +2558,7 @@ static int macb_open(struct net_device *dev) > > err = macb_phylink_connect(bp); > if (err) > - goto napi_exit; > + goto reset_hw; > > netif_tx_start_all_queues(dev); > > @@ -2567,9 +2567,11 @@ static int macb_open(struct net_device *dev) > > return 0; > > -napi_exit: > +reset_hw: > + macb_reset_hw(bp); > for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) > napi_disable(&queue->napi); > + macb_free_consistent(bp); > pm_exit: > pm_runtime_put_sync(&bp->pdev->dev); > return err; >
-- Nicolas Ferre
| |