diff --git a/lib/remoteproc/remoteproc_virtio.c b/lib/remoteproc/remoteproc_virtio.c
index ef39c49e..85105a91 100644
--- a/lib/remoteproc/remoteproc_virtio.c
+++ b/lib/remoteproc/remoteproc_virtio.c
@@ -204,11 +204,10 @@ static void rproc_virtio_set_features(struct virtio_device *vdev,
 static uint32_t rproc_virtio_negotiate_features(struct virtio_device *vdev,
 						uint32_t features)
 {
-	uint32_t dfeatures = rproc_virtio_get_dfeatures(vdev);
+	features = features & rproc_virtio_get_dfeatures(vdev);
+	rproc_virtio_set_features(vdev, features);
 
-	rproc_virtio_set_features(vdev, dfeatures & features);
-
-	return 0;
+	return features;
 }
 #endif