wl1271: Configure rates for templates

[safe/jmp/linux-2.6] / drivers / virtio / virtio.c

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index bd07452..3a43ebf 100644 (file)
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -58,10 +58,10 @@ static struct device_attribute virtio_dev_attrs[] = {
 static inline int virtio_id_match(const struct virtio_device *dev,
                                  const struct virtio_device_id *id)
 {
-       if (id->device != dev->id.device)
+       if (id->device != dev->id.device && id->device != VIRTIO_DEV_ANY_ID)
                return 0;
 
-       return id->vendor == VIRTIO_DEV_ANY_ID || id->vendor != dev->id.vendor;
+       return id->vendor == VIRTIO_DEV_ANY_ID || id->vendor == dev->id.vendor;
 }
 
 /* This looks through all the IDs a driver claims to support.  If any of them