diff options
| author | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
| commit | b18e30412dde08536c9df6eae3f571fddb560e7f (patch) | |
| tree | 1ca4e3ea848d3035311f29a6f03cb884e82e6639 /drivers/s390/net/lcs.c | |
| parent | 09bf825e8e3049db1d72d464d0a6b857cc037a43 (diff) | |
| parent | f2455eb176ac87081bbfc9a44b21c7cd2bc1967e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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 6de28385b35..9bcfa04d863 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) } /* How far in the ccw chain have we processed? */ if ((channel->state != LCS_CH_STATE_INIT) && - (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) { + (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) && + (irb->scsw.cmd.cpa != 0)) { index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) - channel->ccws; if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || |