OSDN Git Service

s390/cio: fix return code after missing interrupt
authorSebastian Ott <sebott@linux.vnet.ibm.com>
Wed, 7 Feb 2018 12:18:19 +0000 (13:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 May 2018 05:49:00 +0000 (07:49 +0200)
commit40b64c59f35505ea9cb250537a95f8915355e87e
tree3e39ddefb62d380368dc2ceb17e8eb40b0277767
parent6bb02ca8aca34675bb3e5b255165fd7cf8c1e1f1
s390/cio: fix return code after missing interrupt

[ Upstream commit 770b55c995d171f026a9efb85e71e3b1ea47b93d ]

When a timeout occurs for users of ccw_device_start_timeout
we will stop the IO and call the drivers int handler with
the irb pointer set to ERR_PTR(-ETIMEDOUT). Sometimes
however we'd set the irb pointer to ERR_PTR(-EIO) which is
not intended. Just set the correct value in all codepaths.

Reported-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/s390/cio/device_fsm.c
drivers/s390/cio/io_sch.h