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

Merge tag 'vfio-ccw-20170724' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into fixes

Pull vfio-ccw fix from Cornelia Huck:
"A bugfix in the ccw translation code."

parents 8ab867cb c389377c

drivers/s390/cio/vfio_ccw_cp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -481,7 +481,7 @@ static int ccwchain_fetch_tic(struct ccwchain *chain,
		ccw_tail = ccw_head + (iter->ch_len - 1) * sizeof(struct ccw1);

		if ((ccw_head <= ccw->cda) && (ccw->cda <= ccw_tail)) {
		ccw->cda = (__u32) (addr_t) (iter->ch_ccw +
		ccw->cda = (__u32) (addr_t) (((char *)iter->ch_ccw) +
		(ccw->cda - ccw_head));
		return 0;
		}