From 3bfe6466cf62ea87321471d3791479448b76c9c3 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Fri, 5 Oct 2012 12:10:50 +0000 Subject: [PATCH] --- yaml --- r: 332903 b: refs/heads/master c: 2dfc96719187d3cb632922a9455abd008db467eb h: refs/heads/master i: 332901: 7e1d895536c19a408590cb1d976851c310141c41 332899: e56fbd043593fd0ff60d417b70d42bdfe79dee39 332895: ac25d000ca7922bf5040ef3e30d27438e23b26a6 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c7b3f86836d..932514f7b338 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14834540cafff24944affd6290f01359799a48ce +refs/heads/master: 2dfc96719187d3cb632922a9455abd008db467eb diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 473ce134ca63..24ad17ec7fcd 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -1601,7 +1601,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->netdev = netdev; adapter->pdev = pdev; - if (qlcnic_alloc_adapter_resources(adapter)) + err = qlcnic_alloc_adapter_resources(adapter); + if (err) goto err_out_free_netdev; adapter->dev_rst_time = jiffies;