Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

[linux.git] / drivers / block / rbd.c

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b008b6a980980ab56a82bc8b35f388b971b294aa..b640ad8a6d206714b1c0f3042916b15340e01ecc 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3435,7 +3435,7 @@ static void rbd_acquire_lock(struct work_struct *work)
        struct rbd_device *rbd_dev = container_of(to_delayed_work(work),
                                            struct rbd_device, lock_dwork);
        enum rbd_lock_state lock_state;
-       int ret;
+       int ret = 0;
 
        dout("%s rbd_dev %p\n", __func__, rbd_dev);
 again: