Skip to content

Commit 491e5b1

Browse files
committed
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
2 parents d07f3b0 + 2c9bdf6 commit 491e5b1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/block/floppy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2123,6 +2123,7 @@ static void format_interrupt(void)
21232123
switch (interpret_errors()) {
21242124
case 1:
21252125
cont->error();
2126+
break;
21262127
case 2:
21272128
break;
21282129
case 0:
@@ -2330,7 +2331,6 @@ static void rw_interrupt(void)
23302331
if (!drive_state[current_drive].first_read_date)
23312332
drive_state[current_drive].first_read_date = jiffies;
23322333

2333-
nr_sectors = 0;
23342334
ssize = DIV_ROUND_UP(1 << raw_cmd->cmd[SIZECODE], 4);
23352335

23362336
if (reply_buffer[ST1] & ST1_EOC)

0 commit comments

Comments
 (0)