diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-12 22:12:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-12 22:12:34 +0300 |
| commit | d6718ccb2502fadeaf4abb2337587bb6eb0e3960 (patch) | |
| tree | 936dbf820dd36c351a909ced61fe6e77c44e1ae8 /drivers/net/ethernet/pensando/ionic/ionic_main.c | |
| parent | 2c864c78c2386ada7433268cdfa8cb77cfe31bf3 (diff) | |
| parent | ddc5911b9bd228dd69de976a4545292420f45e73 (diff) | |
| download | linux-d6718ccb2502fadeaf4abb2337587bb6eb0e3960.tar.xz | |
Merge branch 'ionic-fixes'
Shannon Nelson says:
====================
ionic fixes
These are a couple more fixes after more fw-upgrade testing.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/pensando/ionic/ionic_main.c')
| -rw-r--r-- | drivers/net/ethernet/pensando/ionic/ionic_main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index 588c62e9add7..3344bc1f7671 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -509,16 +509,16 @@ int ionic_port_init(struct ionic *ionic) size_t sz; int err; - if (idev->port_info) - return 0; - - idev->port_info_sz = ALIGN(sizeof(*idev->port_info), PAGE_SIZE); - idev->port_info = dma_alloc_coherent(ionic->dev, idev->port_info_sz, - &idev->port_info_pa, - GFP_KERNEL); if (!idev->port_info) { - dev_err(ionic->dev, "Failed to allocate port info, aborting\n"); - return -ENOMEM; + idev->port_info_sz = ALIGN(sizeof(*idev->port_info), PAGE_SIZE); + idev->port_info = dma_alloc_coherent(ionic->dev, + idev->port_info_sz, + &idev->port_info_pa, + GFP_KERNEL); + if (!idev->port_info) { + dev_err(ionic->dev, "Failed to allocate port info\n"); + return -ENOMEM; + } } sz = min(sizeof(ident->port.config), sizeof(idev->dev_cmd_regs->data)); |