From 6dc256ef3f2b32cbb2557138d1d3002326c1b6fb Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Fri, 5 Oct 2012 12:40:54 +0000 Subject: [PATCH] --- yaml --- r: 332909 b: refs/heads/master c: 4df128341ed5728bc8d8f75709258967f8cc2f5f h: refs/heads/master i: 332907: 89ea56fa6344e20e720e9f65236be7e97d741052 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/sungem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 31b5d023b6d2..3948c4359f6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c65ef4b8a21ab7edc7f35bb9a3892b0051b0158 +refs/heads/master: 4df128341ed5728bc8d8f75709258967f8cc2f5f diff --git a/trunk/drivers/net/ethernet/sun/sungem.c b/trunk/drivers/net/ethernet/sun/sungem.c index 9ae12d0c9632..6c8695ec7cb9 100644 --- a/trunk/drivers/net/ethernet/sun/sungem.c +++ b/trunk/drivers/net/ethernet/sun/sungem.c @@ -2963,7 +2963,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev, goto err_out_iounmap; } - if (gem_get_device_address(gp)) + err = gem_get_device_address(gp); + if (err) goto err_out_free_consistent; dev->netdev_ops = &gem_netdev_ops;