From 9f9a41fb690ddeedf80a52a8d08e013e08748ce4 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Fri, 28 Sep 2012 15:05:16 +0930
Subject: [PATCH] --- yaml --- r: 331409 b: refs/heads/master c:
 5543a6ac31eb4bfd8d938db6b234ce833d14e04e h: refs/heads/master i:   331407:
 6d730d526dd9176385707d07b8b432d2ef990d03 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/virtio/virtio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 94475f5af91c..5e24ec21f468 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eccbb05a64fef867362ff05b5d266757e3c82b36
+refs/heads/master: 5543a6ac31eb4bfd8d938db6b234ce833d14e04e
diff --git a/trunk/drivers/virtio/virtio.c b/trunk/drivers/virtio/virtio.c
index c3b3f7f0d9d1..1e8659ca27ef 100644
--- a/trunk/drivers/virtio/virtio.c
+++ b/trunk/drivers/virtio/virtio.c
@@ -159,7 +159,7 @@ static int virtio_dev_remove(struct device *_d)
 	drv->remove(dev);
 
 	/* Driver should have reset device. */
-	BUG_ON(dev->config->get_status(dev));
+	WARN_ON_ONCE(dev->config->get_status(dev));
 
 	/* Acknowledge the device's existence again. */
 	add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);