Commit b1476451 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'floppy-for-6.2' of https://github.com/evdenis/linux-floppy into for-6.2/block 



Pull floppy fix from Denis:

"Floppy patch for 6.2

 The patch from Yuan Can fixes a memory leak in floppy init code.

 Signed-off-by: default avatarDenis Efremov <efremov@linux.com&gt;">

* tag 'floppy-for-6.2' of https://github.com/evdenis/linux-floppy:
  floppy: Fix memory leak in do_floppy_init()
parents 85d6ce58 f8ace2e3

drivers/block/floppy.c

+3 −1
Original line number Diff line number Diff line
@@ -4593,8 +4593,10 @@ static int __init do_floppy_init(void) 
			goto out_put_disk;



		err = floppy_alloc_disk(drive, 0);

		if (err)

		if (err) {

			blk_mq_free_tag_set(&tag_sets[drive]);

			goto out_put_disk;

		}



		timer_setup(&motor_off_timer[drive], motor_off_callback, 0);

	}