aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2019-07-05 13:39:22 +0200
committerVasily Gorbik <gor@linux.ibm.com>2019-07-05 13:39:22 +0200
commit555827c28a3eaf7c4b020e076eb727b9f2a96b3c (patch)
tree8e4e6eb9fed2ac2ecc04fb535ece015d3e77eb06
parents390/pci: correctly handle MIO opt-out (diff)
parentvfio-ccw: Fix the conversion of Format-0 CCWs to Format-1 (diff)
downloadlinux-dev-555827c28a3eaf7c4b020e076eb727b9f2a96b3c.tar.xz
linux-dev-555827c28a3eaf7c4b020e076eb727b9f2a96b3c.zip
Merge tag 'vfio-ccw-20190705' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features
Fix a bug introduced in the refactoring. * tag 'vfio-ccw-20190705' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw: vfio-ccw: Fix the conversion of Format-0 CCWs to Format-1 Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
-rw-r--r--drivers/s390/cio/vfio_ccw_cp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
index a7b9dfd5b464..1d4c893ead23 100644
--- a/drivers/s390/cio/vfio_ccw_cp.c
+++ b/drivers/s390/cio/vfio_ccw_cp.c
@@ -431,7 +431,7 @@ static int ccwchain_handle_ccw(u32 cda, struct channel_program *cp)
/* Convert any Format-0 CCWs to Format-1 */
if (!cp->orb.cmd.fmt)
- convert_ccw0_to_ccw1(cp->guest_cp, len);
+ convert_ccw0_to_ccw1(cp->guest_cp, CCWCHAIN_LEN_MAX);
/* Count the CCWs in the current chain */
len = ccwchain_calc_length(cda, cp);