diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 12:22:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 12:22:58 +1100 |
| commit | ca5f026efedeb01287863a9c7e1d5fdaf82d196d (patch) | |
| tree | 1df1a290116ceac2f2872b9487b142e79933be93 /net | |
| parent | 4e06510c81c5ff1b61c191cd8d5395c866c7604f (diff) | |
| parent | 047b9b94951dba2e93c65a582ae2bce25c960b86 (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); |