diff --git a/[refs] b/[refs] index a0a7cb8baa9a..330a9c7c25e7 100644 --- 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 index 4cd290c06a88..99f514575f6a 100644 --- 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); }