X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fvirtio%2Fvirtio.c;h=baf103361e3a2053f255f7f7782f955bd4883320;hb=dd7c7bc46211785a1aa7d70feb15830f62682b3c;hp=fc85cba6457831430b76a4f8e1059f35c8c3e325;hpb=faeba830b086bc9e58748869054e994cb09693cd;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index fc85cba6457..baf103361e3 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -113,6 +113,11 @@ static int virtio_dev_probe(struct device *_d)
 			set_bit(f, dev->features);
 	}
 
+	/* Transport features are always preserved to pass to set_features. */
+	for (i = VIRTIO_TRANSPORT_F_START; i < VIRTIO_TRANSPORT_F_END; i++)
+		if (device_features & (1 << i))
+			set_bit(i, dev->features);
+
 	err = drv->probe(dev);
 	if (err)
 		add_status(dev, VIRTIO_CONFIG_S_FAILED);