hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/ide/ide-floppy.c
....@@ -19,6 +19,7 @@
1919 #include <linux/types.h>
2020 #include <linux/string.h>
2121 #include <linux/kernel.h>
22
+#include <linux/compat.h>
2223 #include <linux/delay.h>
2324 #include <linux/timer.h>
2425 #include <linux/mm.h>
....@@ -276,7 +277,7 @@
276277 switch (ide_req(rq)->type) {
277278 case ATA_PRIV_MISC:
278279 case ATA_PRIV_SENSE:
279
- pc = (struct ide_atapi_pc *)rq->special;
280
+ pc = (struct ide_atapi_pc *)ide_req(rq)->special;
280281 break;
281282 default:
282283 BUG();
....@@ -427,7 +428,7 @@
427428 * (maintains previous driver behaviour)
428429 */
429430 break;
430
- /* else: fall through */
431
+ fallthrough;
431432 case CAPACITY_CURRENT:
432433 /* Normal Zip/LS-120 disks */
433434 if (memcmp(cap_desc, &floppy->cap_desc, 8))
....@@ -515,8 +516,6 @@
515516 (void) ide_floppy_get_capacity(drive);
516517
517518 ide_proc_register_driver(drive, floppy->driver);
518
-
519
- drive->dev_flags |= IDE_DFLAG_ATTACH;
520519 }
521520
522521 static void ide_floppy_flush(ide_drive_t *drive)
....@@ -546,4 +545,7 @@
546545 .set_doorlock = ide_set_media_lock,
547546 .do_request = ide_floppy_do_request,
548547 .ioctl = ide_floppy_ioctl,
548
+#ifdef CONFIG_COMPAT
549
+ .compat_ioctl = ide_floppy_compat_ioctl,
550
+#endif
549551 };