summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-01-13 16:43:18 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-03 15:48:51 -0800
commitd909f4315b99e5743041eeb01a2552fcbb125c89 (patch)
tree25846edf9ed069076477be6049a341f02da1fd2b /drivers/char
parent63e144c9d6ffa791c1402f4ee4551c1b9f5a336a (diff)
downloadop-kernel-dev-d909f4315b99e5743041eeb01a2552fcbb125c89.zip
op-kernel-dev-d909f4315b99e5743041eeb01a2552fcbb125c89.tar.gz
virtio/console: verify device has config space
Some devices might not implement config space access (e.g. remoteproc used not to - before 3.9). virtio/console needs config space access so make it fail gracefully if not there. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/virtio_console.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index de03df9..26afb56 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1986,6 +1986,12 @@ static int virtcons_probe(struct virtio_device *vdev)
bool multiport;
bool early = early_put_chars != NULL;
+ if (!vdev->config->get) {
+ dev_err(&vdev->dev, "%s failure: config access disabled\n",
+ __func__);
+ return -EINVAL;
+ }
+
/* Ensure to read early_put_chars now */
barrier();
OpenPOWER on IntegriCloud