diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
| commit | b2a878de11251b06be144b5905e37dd0dc0b0104 (patch) | |
| tree | f510ac1263ebd939493c3358408325804f7ba6e2 /drivers/net/ethernet/chelsio/cxgb/my3126.c | |
| parent | staging: rtl8712: r8712_xmit_classifier(): Change return values and type (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.xz linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.zip | |
Merge 5.3-rc4 into staging-next
We need the iio/staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb/my3126.c')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/my3126.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c index 20c09cc4b323..60aa45b375b6 100644 --- a/drivers/net/ethernet/chelsio/cxgb/my3126.c +++ b/drivers/net/ethernet/chelsio/cxgb/my3126.c @@ -94,7 +94,7 @@ static int my3126_interrupt_handler(struct cphy *cphy) return cphy_cause_link_change; } -static void my3216_poll(struct work_struct *work) +static void my3126_poll(struct work_struct *work) { struct cphy *cphy = container_of(work, struct cphy, phy_update.work); @@ -177,7 +177,7 @@ static struct cphy *my3126_phy_create(struct net_device *dev, return NULL; cphy_init(cphy, dev, phy_addr, &my3126_ops, mdio_ops); - INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll); + INIT_DELAYED_WORK(&cphy->phy_update, my3126_poll); cphy->bmsr = 0; return cphy; |