diff options
| author |   Raghu Vatsavayi <rvatsavayi@caviumnetworks.com> | 2016-07-03 13:56:52 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-04 16:15:31 -0700 |
| commit | 1e0d30fe2143ae8db342e62be67a12479c3c2a20 (patch) | |
| tree | 19b3946b3f975ac2cc80a808fc739cd146229e89 /drivers/net/ethernet/cavium/liquidio/lio_main.c | |
| parent | liquidio: iq/oq limits (diff) | |
| download | linux-dev-1e0d30fe2143ae8db342e62be67a12479c3c2a20.tar.xz linux-dev-1e0d30fe2143ae8db342e62be67a12479c3c2a20.zip | |
liquidio: free resources during shutdown
This patch fixes the issue of proper freeing of queue
memory resources during free device. It also has fix for
correct pcie error reporting.
Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/lio_main.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index a759cc9c204f..e4e476f6344d 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -3957,6 +3957,7 @@ static int octeon_device_init(struct octeon_device *octeon_dev) /* Release any previously allocated queues */ for (j = 0; j < octeon_dev->num_oqs; j++) octeon_delete_droq(octeon_dev, j); + return 1; } atomic_set(&octeon_dev->status, OCT_DEV_DROQ_INIT_DONE); @@ -3979,7 +3980,8 @@ static int octeon_device_init(struct octeon_device *octeon_dev) /* Setup the interrupt handler and record the INT SUM register address */ - octeon_setup_interrupt(octeon_dev); + if (octeon_setup_interrupt(octeon_dev)) + return 1; /* Enable Octeon device interrupts */ octeon_dev->fn_list.enable_interrupt(octeon_dev->chip); |