summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe2014-06-18 19:30:22 +0200
committerJens Axboe2014-06-18 19:30:22 +0200
commite64d4687730cf47bd0c59e9ed76b52ca0c0f44c0 (patch)
treea57f523e749e6aa427a42974734cadabafd60b7b
parentblk-mq: bitmap tag: fix races in bt_get() function (diff)
parentfloppy: format block0 read error message properly (diff)
downloadkernel-qcow2-linux-e64d4687730cf47bd0c59e9ed76b52ca0c0f44c0.tar.gz
kernel-qcow2-linux-e64d4687730cf47bd0c59e9ed76b52ca0c0f44c0.tar.xz
kernel-qcow2-linux-e64d4687730cf47bd0c59e9ed76b52ca0c0f44c0.zip
Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block into for-linus
-rw-r--r--drivers/block/floppy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 677db049f55a..56d46ffb08e1 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3777,7 +3777,7 @@ static void floppy_rb0_cb(struct bio *bio, int err)
int drive = cbdata->drive;
if (err) {
- pr_info("floppy: error %d while reading block 0", err);
+ pr_info("floppy: error %d while reading block 0\n", err);
set_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
}
complete(&cbdata->complete);