Commit fb2c3f44a7e1 for kernel

commit fb2c3f44a7e14627b9dca8e6b568e6cdc234b40b
Merge: 25e7ab89f477 69be770908ae
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Oct 26 07:21:18 2026 -1000

    Merge tag 'ata-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

    Pull ata updates from Niklas Cassel:

     - Make ata_generic refuse to bind to non-IDE devices (me)

     - Add missing <linux/pm_runtime.h> includes (Vladimir)

     - Add pata_cswarp driver for the Amiga CS-Lab Warp card (Paolo)

     - Fix a use-after-free and a parport attach bug in pata_parport (Pei)

     - Switch ahci_da850 to DEFINE_SIMPLE_DEV_PM_OPS() (Li)

     - Documentation and kernel-doc fixes (Karl, Bart, me)

     - Remove the broken sata_inic162x driver (Ethan)

     - Fix probe() error paths in libata, libahci and several drivers (me)

     - Fail probe in sata_dwc_460ex if host activation fails (Nikolay)

     - Use the standard DMA engine API in pata_arasan_cf (Frank)

     - Abort multi-sector pass-through commands when multi_count is 0 (Hui)

     - Replace kmap_atomic() with kmap_local_page() in libata-sff (Danish)

     - Revert the no longer needed JMB582/JMB585 32-bit DMA quirk (Mario)

     - Enable SATA LED presence indication in sata_mv (Carlos)

     - Re-enable FBS after error handling on a port multiplier (Kyrylo)

     - Fix NO_FUA quirks shadowed by earlier quirk entries (me)

     - Do not overwrite the Marvell PATA quirk port mask in ahci (zhoumin)

     - Ignore libata.force transfer modes the host does not support (Rand)

     - Fix a race between IRQ deferral and ata_sff_flush_pio_task() (me)

    * tag 'ata-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux: (26 commits)
      ata: libata-sff: fix race between IRQ deferral and ata_sff_flush_pio_task()
      ata: libata-core: Ignore forced transfer modes the host does not support
      ata: ahci: preserve preset port masks
      ata: libata-core: Fix NO_FUA quirks shadowed by earlier quirk entries
      ata: libahci: re-enable FBS after error handling on a port multiplier
      ata: sata_mv: enable SoC SATA LED presence indication
      ata: libata: Fix scsi_done() documentation
      Revert "ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585"
      ata: pata_parport: fix parport attach idr_alloc for
      ata: libata-sff: replace kmap_atomic() with kmap_local_page()
      ata: libata-scsi: abort multi-sector pass-through commands when multi_count is 0
      ata: pata_arasan_cf: use standard DMA engine API
      ata: sata_dwc_460ex: Don't enable interrupt if libATA core registration fails
      ata: libata-core: Fix the ata_host_register() kdoc
      ata: libata: Do not leave ata_host_stop() registered when activation fails
      ata: libahci: Free the IRQs when activating a multi-IRQ host fails
      ata: sata_fsl: Fix use-after-free of host_priv on probe() failure
      ata: ahci_st: Assert the power down reset in the probe() error path
      ata: ahci_st: Do not ignore errors when getting the reset controls
      ata: sata_inic162x: remove dangerous broken driver
      ...

diff --cc drivers/ata/libata-scsi.c
index 5939371242b0,115b75a313bc..a61fb0331279
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@@ -3582,6 -3507,11 +3582,12 @@@ static unsigned int ata_scsi_pass_thru(
  	if (is_multi_taskfile(tf)) {
  		unsigned int multi_count = 1 << (cdb[1] >> 5);

+ 		if (!dev->multi_count) {
 -			ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND, 0, 0);
++			ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND,
++					   NO_ADDITIONAL_SENSE_INFORMATION);
+ 			return 1;
+ 		}
+
  		/* compare the passed through multi_count
  		 * with the cached multi_count of libata
  		 */