diff options
| author | Jens Axboe <axboe@fb.com> | 2014-06-18 13:30:22 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-06-18 13:30:22 -0400 |
| commit | e64d4687730cf47bd0c59e9ed76b52ca0c0f44c0 (patch) | |
| tree | a57f523e749e6aa427a42974734cadabafd60b7b | |
| parent | 86fb5c56cfa26de5e91c9a50e2767a695dff366e (diff) | |
| parent | 1c65df3d7b1b311a73f5636a4ad6611f067baf1e (diff) | |
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.c | 2 |
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) | |||
| 3777 | int drive = cbdata->drive; | 3777 | int drive = cbdata->drive; |
| 3778 | 3778 | ||
| 3779 | if (err) { | 3779 | if (err) { |
| 3780 | pr_info("floppy: error %d while reading block 0", err); | 3780 | pr_info("floppy: error %d while reading block 0\n", err); |
| 3781 | set_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); | 3781 | set_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); |
| 3782 | } | 3782 | } |
| 3783 | complete(&cbdata->complete); | 3783 | complete(&cbdata->complete); |