Merge tag 'char-misc-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[~andy/linux] / drivers / md / dm-flakey.c

diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index 7fcf21cb4ff869dd636c91ffe2f8248f0a1d17c7..c80a0ec5f1269b40be7da133c68c6e789c5e5329 100644 (file)
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -176,7 +176,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
        fc = kzalloc(sizeof(*fc), GFP_KERNEL);
        if (!fc) {
-               ti->error = "Cannot allocate linear context";
+               ti->error = "Cannot allocate context";
                return -ENOMEM;
        }
        fc->start_time = jiffies;