---

yaml --- r: 147967 b: refs/heads/master c: ee006b3 h: refs/heads/master i: 147965: ca1c447 147963: 3b19884 147959: 1c95ab7 147951: 9235578 147935: a756f14 147903: a9f0cb0 147839: 00146c8 147711: fb128f4 147455: cada1d8 v: v3
git-mirror · Jun 12, 2009 · eb257d8 · eb257d8
1 parent 8f8de4c
commit eb257d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a92892825a122a74ddad1d408fa27132e28b05ae
+refs/heads/master: ee006b353f1ca8c9a8470b72b462beb011d62e32
diff --git a/trunk/include/linux/virtio_config.h b/trunk/include/linux/virtio_config.h
@@ -113,7 +113,9 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
 	if (__builtin_constant_p(fbit))
 		BUILD_BUG_ON(fbit >= 32);
 
-	virtio_check_driver_offered_feature(vdev, fbit);
+	if (fbit < VIRTIO_TRANSPORT_F_START)
+		virtio_check_driver_offered_feature(vdev, fbit);
+
 	return test_bit(fbit, vdev->features);
 }