Merge branch 'next-s3c-hwmon' into next-s3c

[firefly-linux-kernel-4.4.55.git] / drivers / virtio / virtio.c

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 22642a255d32f62c307bbd12245a06efddbf09cb..3a43ebf83a49d6b869339e8f94da1f097141cb07 100644 (file)
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -58,7 +58,7 @@ 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;