1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 6928c136d3c5..0fd1f7c2e162 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -163,34 +163,32 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad;
         }
 
-        if (argc == 3) {
-                dc->dev_write = NULL;
+        dc->dev_write = NULL;
+        if (argc == 3)
                 goto out;
-        }
 
         if (sscanf(argv[4], "%llu", &tmpll) != 1) {
                 ti->error = "Invalid write device sector";
-                goto bad;
+                goto bad_dev_read;
         }
         dc->start_write = tmpll;
 
         if (sscanf(argv[5], "%u", &dc->write_delay) != 1) {
                 ti->error = "Invalid write delay";
-                goto bad;
+                goto bad_dev_read;
         }
 
         if (dm_get_device(ti, argv[3], dc->start_write, ti->len,
                           dm_table_get_mode(ti->table), &dc->dev_write)) {
                 ti->error = "Write device lookup failed";
-                dm_put_device(ti, dc->dev_read);
-                goto bad;
+                goto bad_dev_read;
         }
 
 out:
         dc->delayed_pool = mempool_create_slab_pool(128, delayed_cache);
         if (!dc->delayed_pool) {
                 DMERR("Couldn't create delayed bio pool.");
-                goto bad;
+                goto bad_dev_write;
         }
 
         setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
@@ -203,6 +201,11 @@ out:
         ti->private = dc;
         return 0;
 
+bad_dev_write:
+        if (dc->dev_write)
+                dm_put_device(ti, dc->dev_write);
+bad_dev_read:
+        dm_put_device(ti, dc->dev_read);
 bad:
         kfree(dc);
         return -EINVAL;