diff options
| author | Jens Axboe <[email protected]> | 2021-06-15 15:41:17 -0600 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2021-06-15 15:41:17 -0600 |
| commit | 491e5b170ef8bf951d9337b1a7ee9f9c1465ffe8 (patch) | |
| tree | 24c5b5870d59b29aad654e7f3c4815f01bb056a6 | |
| parent | d07f3b081ee632268786601f55e1334d1f68b997 (diff) | |
| parent | 2c9bdf6e4771a5966a4f0d6bea45a1c7f38312d7 (diff) | |
Merge tag 'floppy-for-5.14' of https://github.com/evdenis/linux-floppy into for-5.14/drivers
Pull floppy fixes from Denis:
"Floppy patches for 5.14
Two oneliners to fix clang warnings:
- -Wimplicit-fallthrough warning fix from Gustavo A. R. Silva.
- Redundant assignment warning fix from Jiapeng Chong.
No semantic and behavioural changes."
* tag 'floppy-for-5.14' of https://github.com/evdenis/linux-floppy:
floppy: Fix fall-through warning for Clang
floppy: cleanup: remove redundant assignment to nr_sectors
| -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 8a9d22207c59..cde70b0a55dd 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -2123,6 +2123,7 @@ static void format_interrupt(void) switch (interpret_errors()) { case 1: cont->error(); + break; case 2: break; case 0: @@ -2330,7 +2331,6 @@ static void rw_interrupt(void) if (!drive_state[current_drive].first_read_date) drive_state[current_drive].first_read_date = jiffies; - nr_sectors = 0; ssize = DIV_ROUND_UP(1 << raw_cmd->cmd[SIZECODE], 4); if (reply_buffer[ST1] & ST1_EOC) |