summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-01-12 15:23:37 +0100
committerRusty Russell <rusty@rustcorp.com.au>2015-01-21 06:58:47 +0100
commit6ba422489bcaebd89142cc0aeae9095d03c8301a (patch)
treee6759be166eb1489f5efe7bf7c8e3ab993a841a4 /drivers
parentvirtio/console: verify device has config space (diff)
downloadlinux-6ba422489bcaebd89142cc0aeae9095d03c8301a.tar.xz
linux-6ba422489bcaebd89142cc0aeae9095d03c8301a.zip
virtio/net: verify device has config space
Some devices might not implement config space access (e.g. remoteproc used not to - before 3.9). virtio/net needs config space access so make it fail gracefully if not there. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/virtio_net.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 5ca97713bfb3..9bc107200709 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1713,6 +1713,12 @@ static int virtnet_probe(struct virtio_device *vdev)
struct virtnet_info *vi;
u16 max_queue_pairs;
+ if (!vdev->config->get) {
+ dev_err(&vdev->dev, "%s failure: config access disabled\n",
+ __func__);
+ return -EINVAL;
+ }
+
if (!virtnet_validate_features(vdev))
return -EINVAL;