1 files changed, 2 insertions, 3 deletions

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 0117b9fb8480..de7a9f532edc 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -110,7 +110,7 @@ static struct p9_req_t *p9_lookup_tag(struct virtio_chan *c, u16 tag)
                 }
                 for (count = old_max; count < c->max_tag; count++) {
                         c->reqs[count].status = REQ_STATUS_IDLE;
-                        c->reqs[count].wq = kmalloc(sizeof(wait_queue_t),
+                        c->reqs[count].wq = kmalloc(sizeof(wait_queue_head_t),
                                                                 GFP_ATOMIC);
                         if (!c->reqs[count].wq) {
                                 printk(KERN_ERR "Couldn't grow tag array\n");
@@ -183,8 +183,7 @@ pack_sg_list(struct scatterlist *sg, int start, int limit, char *data,
                 sg_set_buf(&sg[index++], data, s);
                 count -= s;
                 data += s;
-                if (index > limit)
-                        BUG();
+                BUG_ON(index > limit);
         }
 
         return index-start;