diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 15:55:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 15:55:13 +1100 |
| commit | 2196cde35fb6839d87200ca6f5faaa282a9f58b3 (patch) | |
| tree | c5d73aebe82122cf16d561bd59a4510a02832411 /net | |
| parent | ce57ac48b1a727439f7f7afdfdb261a881271928 (diff) | |
| parent | 2342d6a6512ce5a3d2433bf77e6580e738cfd709 (diff) | |
Merge remote-tracking branch 'virtio/virtio-next'
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/trans_virtio.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 990afab2be1b..9c5a1aa34d12 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -544,9 +544,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) chan->inuse = false; if (virtio_has_feature(vdev, VIRTIO_9P_MOUNT_TAG)) { - vdev->config->get(vdev, - offsetof(struct virtio_9p_config, tag_len), - &tag_len, sizeof(tag_len)); + virtio_cread(vdev, struct virtio_9p_config, tag_len, &tag_len); } else { err = -EINVAL; goto out_free_vq; @@ -556,8 +554,9 @@ static int p9_virtio_probe(struct virtio_device *vdev) err = -ENOMEM; goto out_free_vq; } - vdev->config->get(vdev, offsetof(struct virtio_9p_config, tag), - tag, tag_len); + + virtio_cread_bytes(vdev, offsetof(struct virtio_9p_config, tag), + tag, tag_len); chan->tag = tag; chan->tag_len = tag_len; err = sysfs_create_file(&(vdev->dev.kobj), &dev_attr_mount_tag.attr); |