From: Michael S. Tsirkin Date: Tue, 9 Dec 2014 12:46:44 +0000 (+0200) Subject: virtio_ccw: future-proof finalize_features X-Git-Tag: v3.19-rc1~25^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f13d8bc2a16c5d1dd3dbd8b64dbd42cfe78da93e;p=platform%2Fkernel%2Flinux-exynos.git virtio_ccw: future-proof finalize_features We never negotiate revision > 1, but just to make this code more likely to work when we do, require VERSION_1 with any revision >= 1. Signed-off-by: Michael S. Tsirkin Acked-by: Cornelia Huck --- diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index f9f87ba..f92b9e6 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -758,7 +758,7 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev) struct virtio_feature_desc *features; struct ccw1 *ccw; - if (vcdev->revision == 1 && + if (vcdev->revision >= 1 && !__virtio_test_bit(vdev, VIRTIO_F_VERSION_1)) { dev_err(&vdev->dev, "virtio: device uses revision 1 " "but does not have VIRTIO_F_VERSION_1\n");