Skip to content

Commit 83aa9ba

Browse files
committed
phylink: try to fix merge issue on erics commit
1 parent 7c124d1 commit 83aa9ba

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

drivers/net/phy/phylink.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3444,6 +3444,7 @@ static bool phylink_phy_no_inband(struct phy_device *phy)
34443444
static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
34453445
{
34463446
struct phylink *pl = upstream;
3447+
int ret;
34473448
u8 mode;
34483449

34493450
/*
@@ -3469,15 +3470,6 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
34693470
if (ret < 0)
34703471
return ret;
34713472

3472-
interface = pl->link_config.interface;
3473-
ret = phylink_attach_phy(pl, phy, interface);
3474-
if (ret < 0)
3475-
return ret;
3476-
3477-
ret = phylink_bringup_phy(pl, phy, interface);
3478-
if (ret)
3479-
phy_detach(phy);
3480-
34813473
phylink_major_config(pl, false, &pl->phy_state);
34823474

34833475
return ret;

0 commit comments

Comments
 (0)