diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-02-02 11:29:29 -0500 |
| commit | a584143b01ce69803116ae8d0a4db382acc728d7 (patch) | |
| tree | 002733709647fa1e17683a9d21dbc23ae99e3d2d /drivers/block/virtio_blk.c | |
| parent | 4c94e13e9caed09103419c087f436d79f9d2faba (diff) | |
| parent | 8116bf4cb62d337c953cfa5369ef4cf83e73140c (diff) | |
| download | blackbird-op-linux-a584143b01ce69803116ae8d0a4db382acc728d7.tar.gz blackbird-op-linux-a584143b01ce69803116ae8d0a4db382acc728d7.zip | |
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
Christoph's block pnfs patches have some minor dependencies on these
lock patches.
Diffstat (limited to 'drivers/block/virtio_blk.c')
| -rw-r--r-- | drivers/block/virtio_blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 7ef7c098708f..cdfbd21e3597 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -638,7 +638,7 @@ static int virtblk_probe(struct virtio_device *vdev) goto out_put_disk; q = vblk->disk->queue = blk_mq_init_queue(&vblk->tag_set); - if (!q) { + if (IS_ERR(q)) { err = -ENOMEM; goto out_free_tags; } |
