diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-30 17:35:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-30 17:35:32 -0700 |
| commit | e9bcbc970a774bc8e17fd7eb24b9969be67d666e (patch) | |
| tree | af8d8ad62a6b81cc570cdfed83496872e670e909 /drivers/s390/net/qeth_core_main.c | |
| parent | 078252e0e877b50fcd42d3bd0d112f1f7c8518e8 (diff) | |
| parent | a68be015aece7b9f33f1523048e445b72ca7111d (diff) | |
Merge branch 's390-next'
Frank Blaschka says:
====================
s390: network patches for net-next V1
here are some s390 related patches for net-next
Added some style fixing reported by David Laight.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 34993009a9e..549e9fd5bfd 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -1013,7 +1013,7 @@ static long __qeth_check_irb_error(struct ccw_device *cdev, card = CARD_FROM_CDEV(cdev); - if (!IS_ERR(irb)) + if (!card || !IS_ERR(irb)) return 0; switch (PTR_ERR(irb)) { @@ -1029,7 +1029,7 @@ static long __qeth_check_irb_error(struct ccw_device *cdev, QETH_CARD_TEXT(card, 2, "ckirberr"); QETH_CARD_TEXT_(card, 2, " rc%d", -ETIMEDOUT); if (intparm == QETH_RCD_PARM) { - if (card && (card->data.ccwdev == cdev)) { + if (card->data.ccwdev == cdev) { card->data.state = CH_STATE_DOWN; wake_up(&card->wait_q); } |