diff options
| author | Russell King | 2010-03-15 15:27:06 +0100 |
|---|---|---|
| committer | Russell King | 2010-03-15 15:27:06 +0100 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /drivers/s390/net/qeth_l2_main.c | |
| parent | Video: ARM CLCD: Better fix for swapped IENB and CNTL registers (diff) | |
| parent | video: enable sh_mobile_lcdc on SH-Mobile ARM (diff) | |
| download | kernel-qcow2-linux-2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74.tar.gz kernel-qcow2-linux-2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74.tar.xz kernel-qcow2-linux-2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'drivers/s390/net/qeth_l2_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 51fde6f2e0b8..6f1e3036bafd 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -1071,11 +1071,9 @@ static int qeth_l2_recover(void *ptr) dev_info(&card->gdev->dev, "Device successfully recovered!\n"); else { - if (card->dev) { - rtnl_lock(); - dev_close(card->dev); - rtnl_unlock(); - } + rtnl_lock(); + dev_close(card->dev); + rtnl_unlock(); dev_warn(&card->gdev->dev, "The qeth device driver " "failed to recover an error on the device\n"); } @@ -1129,11 +1127,9 @@ static int qeth_l2_pm_resume(struct ccwgroup_device *gdev) if (card->state == CARD_STATE_RECOVER) { rc = __qeth_l2_set_online(card->gdev, 1); if (rc) { - if (card->dev) { - rtnl_lock(); - dev_close(card->dev); - rtnl_unlock(); - } + rtnl_lock(); + dev_close(card->dev); + rtnl_unlock(); } } else rc = __qeth_l2_set_online(card->gdev, 0); |