1 files changed, 6 insertions, 3 deletions

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 02f0acb549d6..1fa5faa26440 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -318,12 +318,13 @@ static inline u16 virtio_cread16(struct virtio_device *vdev,
 {
         u16 ret;
         vdev->config->get(vdev, offset, &ret, sizeof(ret));
-        return ret;
+        return virtio16_to_cpu(vdev, (__force __virtio16)ret);
 }
 
 static inline void virtio_cwrite16(struct virtio_device *vdev,
                                    unsigned int offset, u16 val)
 {
+        val = (__force u16)cpu_to_virtio16(vdev, val);
         vdev->config->set(vdev, offset, &val, sizeof(val));
 }
 
@@ -332,12 +333,13 @@ static inline u32 virtio_cread32(struct virtio_device *vdev,
 {
         u32 ret;
         vdev->config->get(vdev, offset, &ret, sizeof(ret));
-        return ret;
+        return virtio32_to_cpu(vdev, (__force __virtio32)ret);
 }
 
 static inline void virtio_cwrite32(struct virtio_device *vdev,
                                    unsigned int offset, u32 val)
 {
+        val = (__force u32)cpu_to_virtio32(vdev, val);
         vdev->config->set(vdev, offset, &val, sizeof(val));
 }
 
@@ -346,12 +348,13 @@ static inline u64 virtio_cread64(struct virtio_device *vdev,
 {
         u64 ret;
         vdev->config->get(vdev, offset, &ret, sizeof(ret));
-        return ret;
+        return virtio64_to_cpu(vdev, (__force __virtio64)ret);
 }
 
 static inline void virtio_cwrite64(struct virtio_device *vdev,
                                    unsigned int offset, u64 val)
 {
+        val = (__force u64)cpu_to_virtio64(vdev, val);
         vdev->config->set(vdev, offset, &val, sizeof(val));
 }