diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2019-02-07 11:57:38 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2019-02-07 11:57:38 +0100 |
| commit | b96027d3b760184d48b819983f13b318dabbf95c (patch) | |
| tree | 509d1865bbc5662a47b0895645accb5a1041ad95 /drivers/s390 | |
| parent | s390: add alignment hints to vector load and store (diff) | |
| parent | vfio-ccw: Don't assume there are more ccws after a TIC (diff) | |
| download | linux-b96027d3b760184d48b819983f13b318dabbf95c.tar.xz linux-b96027d3b760184d48b819983f13b318dabbf95c.zip | |
Merge tag 'vfio-ccw-20190204' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features
Pull vfio-ccw from Cornelia Huck with the following changes:
- A fix in ccw chain processing.
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_cp.c | 2 |
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 70a006ba4d05..ba08fe137c2e 100644 --- a/drivers/s390/cio/vfio_ccw_cp.c +++ b/drivers/s390/cio/vfio_ccw_cp.c @@ -392,7 +392,7 @@ static int ccwchain_calc_length(u64 iova, struct channel_program *cp) return -EOPNOTSUPP; } - if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw))) + if (!ccw_is_chain(ccw)) break; ccw++; |