diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
commit | df69471290cbec7714f6d1fabd14f4e41219cee1 (patch) | |
tree | 1a8d9d3fce98db7b4382c24994feba6fa771805f /drivers/s390/net/lcs.c | |
parent | d994af0d50efc96b2077978fe9f066992639d525 (diff) | |
parent | 17393dd67c06c3912ff47b31268b648929715336 (diff) |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/s390/net/lcs.c')
-rw-r--r-- | drivers/s390/net/lcs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 6de28385b354..9bcfa04d863b 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1412,7 +1412,8 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1412 | } | 1412 | } |
1413 | /* How far in the ccw chain have we processed? */ | 1413 | /* How far in the ccw chain have we processed? */ |
1414 | if ((channel->state != LCS_CH_STATE_INIT) && | 1414 | if ((channel->state != LCS_CH_STATE_INIT) && |
1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) { | 1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) && |
1416 | (irb->scsw.cmd.cpa != 0)) { | ||
1416 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) | 1417 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) |
1417 | - channel->ccws; | 1418 | - channel->ccws; |
1418 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || | 1419 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || |