From c81d13a16123bcda34a8e957a03818e6d3c5f920 Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Mon, 9 Mar 2009 10:59:25 +0000 Subject: [PATCH] --- yaml --- r: 135123 b: refs/heads/master c: 39a28bc480bff0f778d043877aff2fd16ad5f769 h: refs/heads/master i: 135121: 286a480380aa08f7cdd2412b40b0e860541f7ae5 135119: 2cf87a6ad4b545c556f92fae2042124e9fe7c505 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 246f35bf35fc..507b27880fb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b25215d0433f6c71b68eede3548815196a2ed5d5 +refs/heads/master: 39a28bc480bff0f778d043877aff2fd16ad5f769 diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index 75ad4dbb5cb7..f7f104ab5ffb 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/drivers/net/qlge/qlge_main.c @@ -3250,14 +3250,12 @@ static int ql_adapter_up(struct ql_adapter *qdev) { int err = 0; - spin_lock(&qdev->hw_lock); err = ql_adapter_initialize(qdev); if (err) { QPRINTK(qdev, IFUP, INFO, "Unable to initialize adapter.\n"); spin_unlock(&qdev->hw_lock); goto err_init; } - spin_unlock(&qdev->hw_lock); set_bit(QL_ADAPTER_UP, &qdev->flags); ql_alloc_rx_buffers(qdev); if ((ql_read32(qdev, STS) & qdev->port_init))