X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fblock%2Fvirtio_blk.c;h=258bc2ae2885625a1650cebcabb4b9eb975092bb;hb=636667a545b2d16797f27002a65d688c195c9b60;hp=83fa09a836ca8574a3696c888d7574a833b35447;hpb=fa7eadab4b4aec0139d2429e6f8d13375ff8a658;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 83fa09a836ca..258bc2ae2885 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -298,7 +298,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
 	err = virtio_config_val(vdev, VIRTIO_BLK_F_SEG_MAX,
 				offsetof(struct virtio_blk_config, seg_max),
 				&sg_elems);
-	if (err)
+
+	/* We need at least one SG element, whatever they say. */
+	if (err || !sg_elems)
 		sg_elems = 1;
 
 	/* We need an extra sg elements at head and tail. */