diff options
| author | Mark Brown | 2019-05-20 12:54:21 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-20 12:54:21 +0200 |
| commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
| tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/net/ethernet/qualcomm/qca_spi.c | |
| parent | spi: tegra114: add support for TX and RX trimmers (diff) | |
| parent | Linux 5.2-rc1 (diff) | |
| download | kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.xz kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip | |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/net/ethernet/qualcomm/qca_spi.c')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/qca_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 97f92953bdb9..b28360bc2255 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -966,7 +966,7 @@ qca_spi_probe(struct spi_device *spi) mac = of_get_mac_address(spi->dev.of_node); - if (mac) + if (!IS_ERR(mac)) ether_addr_copy(qca->net_dev->dev_addr, mac); if (!is_valid_ether_addr(qca->net_dev->dev_addr)) { |