diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-01-13 09:43:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-03 18:48:51 -0500 |
commit | d909f4315b99e5743041eeb01a2552fcbb125c89 (patch) | |
tree | 25846edf9ed069076477be6049a341f02da1fd2b /drivers/char | |
parent | 63e144c9d6ffa791c1402f4ee4551c1b9f5a336a (diff) |
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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index de03df9dd7c9..26afb56a8073 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) | |||
1986 | bool multiport; | 1986 | bool multiport; |
1987 | bool early = early_put_chars != NULL; | 1987 | bool early = early_put_chars != NULL; |
1988 | 1988 | ||
1989 | if (!vdev->config->get) { | ||
1990 | dev_err(&vdev->dev, "%s failure: config access disabled\n", | ||
1991 | __func__); | ||
1992 | return -EINVAL; | ||
1993 | } | ||
1994 | |||
1989 | /* Ensure to read early_put_chars now */ | 1995 | /* Ensure to read early_put_chars now */ |
1990 | barrier(); | 1996 | barrier(); |
1991 | 1997 | ||