* [PATCH net-next 1/2] rocker: NULL port if port probe fails
@ 2015-08-04 5:31 sfeldma
2015-08-04 5:31 ` [PATCH net-next 2/2] rocker: use netdev_err after register_netdev sfeldma
2015-08-07 4:48 ` [PATCH net-next 1/2] rocker: NULL port if port probe fails David Miller
0 siblings, 2 replies; 4+ messages in thread
From: sfeldma @ 2015-08-04 5:31 UTC (permalink / raw)
To: netdev; +Cc: jiri
From: Scott Feldman <sfeldma@gmail.com>
Set port to NULL if port probe fails so we don't try to remove partially
initialized port on port probe err cleanup path.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
drivers/net/ethernet/rocker/rocker.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 7b4c347..0ab3a3b 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -5005,6 +5005,7 @@ err_untagged_vlan:
rocker_port_ig_tbl(rocker_port, SWITCHDEV_TRANS_NONE,
ROCKER_OP_FLAG_REMOVE);
err_port_ig_tbl:
+ rocker->ports[port_number] = NULL;
unregister_netdev(dev);
err_register_netdev:
free_netdev(dev);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] rocker: use netdev_err after register_netdev
2015-08-04 5:31 [PATCH net-next 1/2] rocker: NULL port if port probe fails sfeldma
@ 2015-08-04 5:31 ` sfeldma
2015-08-07 4:48 ` David Miller
2015-08-07 4:48 ` [PATCH net-next 1/2] rocker: NULL port if port probe fails David Miller
1 sibling, 1 reply; 4+ messages in thread
From: sfeldma @ 2015-08-04 5:31 UTC (permalink / raw)
To: netdev; +Cc: jiri
From: Scott Feldman <sfeldma@gmail.com>
After successful register_netdev, we can use netdev_err rather the more
generic dev_err.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
drivers/net/ethernet/rocker/rocker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 0ab3a3b..4e8cad0 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4985,7 +4985,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
err = rocker_port_ig_tbl(rocker_port, SWITCHDEV_TRANS_NONE, 0);
if (err) {
- dev_err(&pdev->dev, "install ig port table failed\n");
+ netdev_err(rocker_port->dev, "install ig port table failed\n");
goto err_port_ig_tbl;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next 1/2] rocker: NULL port if port probe fails
2015-08-04 5:31 [PATCH net-next 1/2] rocker: NULL port if port probe fails sfeldma
2015-08-04 5:31 ` [PATCH net-next 2/2] rocker: use netdev_err after register_netdev sfeldma
@ 2015-08-07 4:48 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2015-08-07 4:48 UTC (permalink / raw)
To: sfeldma; +Cc: netdev, jiri
From: sfeldma@gmail.com
Date: Mon, 3 Aug 2015 22:31:17 -0700
> From: Scott Feldman <sfeldma@gmail.com>
>
> Set port to NULL if port probe fails so we don't try to remove partially
> initialized port on port probe err cleanup path.
>
> Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-07 4:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-04 5:31 [PATCH net-next 1/2] rocker: NULL port if port probe fails sfeldma
2015-08-04 5:31 ` [PATCH net-next 2/2] rocker: use netdev_err after register_netdev sfeldma
2015-08-07 4:48 ` David Miller
2015-08-07 4:48 ` [PATCH net-next 1/2] rocker: NULL port if port probe fails David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).