From 8dee365fec2336b717994679765738b97d304a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Date: Sun, 24 Mar 2013 14:19:59 +1030 Subject: [PATCH] --- yaml --- r: 370955 b: refs/heads/master c: a8c7687bf21603af6246e55cc58f98e42241bd01 h: refs/heads/master i: 370953: c9a9a43a5dde5fa181bf4790c34d595661674dd5 370951: dc80db299bab369954c1140b1cc5a2975c2bacf5 v: v3 --- [refs] | 2 +- trunk/drivers/net/caif/caif_virtio.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 842542a2abbd..8132188b60b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2273be8d2df7b77165a70930064aeb9e8faebfa +refs/heads/master: a8c7687bf21603af6246e55cc58f98e42241bd01 diff --git a/trunk/drivers/net/caif/caif_virtio.c b/trunk/drivers/net/caif/caif_virtio.c index fb80765e258e..316b184ea130 100644 --- a/trunk/drivers/net/caif/caif_virtio.c +++ b/trunk/drivers/net/caif/caif_virtio.c @@ -670,6 +670,10 @@ static int cfv_probe(struct virtio_device *vdev) spin_lock_init(&cfv->tx_lock); /* Get the RX virtio ring. This is a "host side vring". */ + err = -ENODEV; + if (!vdev->vringh_config || !vdev->vringh_config->find_vrhs) + goto err; + err = vdev->vringh_config->find_vrhs(vdev, 1, &cfv->vr_rx, &vrh_cbs); if (err) goto err;