summaryrefslogtreecommitdiff
path: root/drivers/s390/char/sclp_rw.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-24 07:38:20 +0300
committerDavid S. Miller <davem@davemloft.net>2008-02-24 07:38:20 +0300
commit8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch)
treee0f017aff86d3ad0b858fe85f44e11096087ed00 /drivers/s390/char/sclp_rw.c
parent1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff)
parent038eb0ea04b245351be34b0ae76b55eee4603989 (diff)
downloadlinux-8d3c202be23c5a915f7053ebd4e96f44700c6a62.tar.xz
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'drivers/s390/char/sclp_rw.c')
-rw-r--r--drivers/s390/char/sclp_rw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index ad7195d3de0c..da09781b32f7 100644
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -452,10 +452,10 @@ sclp_emit_buffer(struct sclp_buffer *buffer,
return -EIO;
sccb = buffer->sccb;
- if (sclp_rw_event.sclp_send_mask & EVTYP_MSG_MASK)
+ if (sclp_rw_event.sclp_receive_mask & EVTYP_MSG_MASK)
/* Use normal write message */
sccb->msg_buf.header.type = EVTYP_MSG;
- else if (sclp_rw_event.sclp_send_mask & EVTYP_PMSGCMD_MASK)
+ else if (sclp_rw_event.sclp_receive_mask & EVTYP_PMSGCMD_MASK)
/* Use write priority message */
sccb->msg_buf.header.type = EVTYP_PMSGCMD;
else