diff options
| author |   Martin Habets <mhabets@solarflare.com> | 2019-11-21 17:52:15 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-21 12:06:06 -0800 |
| commit | 723eb53690041740a13ac78efeaf6804f5d684c9 (patch) | |
| tree | e5ee57143dccb75b9a518101f2688a13f974e6e0 /drivers/net/ethernet | |
| parent | nfc: port100: handle command failure cleanly (diff) | |
| download | linux-dev-723eb53690041740a13ac78efeaf6804f5d684c9.tar.xz linux-dev-723eb53690041740a13ac78efeaf6804f5d684c9.zip | |
sfc: Only cancel the PPS workqueue if it exists
The workqueue only exists for the primary PF. For other functions
we hit a WARN_ON in kernel/workqueue.c.
Fixes: 7c236c43b838 ("sfc: Add support for IEEE-1588 PTP")
Signed-off-by: Martin Habets <mhabets@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 02ed6d1b716c..af15a737c675 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -1531,7 +1531,8 @@ void efx_ptp_remove(struct efx_nic *efx) (void)efx_ptp_disable(efx); cancel_work_sync(&efx->ptp_data->work); - cancel_work_sync(&efx->ptp_data->pps_work); + if (efx->ptp_data->pps_workwq) + cancel_work_sync(&efx->ptp_data->pps_work); skb_queue_purge(&efx->ptp_data->rxq); skb_queue_purge(&efx->ptp_data->txq); |