---

yaml --- r: 272096 b: refs/heads/master c: 7bf4074 h: refs/heads/master v: v3
git-mirror · Oct 30, 2011 · 6b84c2f · 6b84c2f
1 parent 077e9f2
commit 6b84c2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;
 }
 
 /*