---

yaml --- r: 370955 b: refs/heads/master c: a8c7687 h: refs/heads/master i: 370953: c9a9a43 370951: dc80db2 v: v3
git-mirror · Mar 24, 2013 · 8dee365 · 8dee365
1 parent 426b3c8
commit 8dee365
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;