From 6b84c2f4ec73b40256720d5727a9325e76b249d7 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Sun, 30 Oct 2011 15:17:17 +0100 Subject: [PATCH] --- yaml --- r: 272096 b: refs/heads/master c: 7bf4074dd9d41d28447f1b106d91ad0ad0ea454a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/kvm/kvm_virtio.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2f8d516f891a..396757aef511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 246ccea184423ccdec3be1ca3d400cc3c547404d +refs/heads/master: 7bf4074dd9d41d28447f1b106d91ad0ad0ea454a diff --git a/trunk/drivers/s390/kvm/kvm_virtio.c b/trunk/drivers/s390/kvm/kvm_virtio.c index 83c69fbc43fc..3c2c923d5c0a 100644 --- a/trunk/drivers/s390/kvm/kvm_virtio.c +++ b/trunk/drivers/s390/kvm/kvm_virtio.c @@ -334,10 +334,10 @@ static void scan_devices(void) */ static int match_desc(struct device *dev, void *data) { - if ((ulong)to_kvmdev(dev_to_virtio(dev))->desc == (ulong)data) - return 1; + struct virtio_device *vdev = dev_to_virtio(dev); + struct kvm_device *kdev = to_kvmdev(vdev); - return 0; + return kdev->desc == data; } /*