Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 555827c2 authored by Vasily Gorbik's avatar Vasily Gorbik
Browse files

Merge tag 'vfio-ccw-20190705' of... 

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: default avatarVasily Gorbik <gor@linux.ibm.com>
parents 6ae3483d c382cbc6

drivers/s390/cio/vfio_ccw_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);