From: Niklas Cassel <cassel@kernel.org>
Date: Fri, 20 Mar 2026 10:13:32 +0000 (+0100)
Subject: Merge branch 'for-7.0-fixes' into for-7.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d78c5bbf098fd93884a5dc05aec045f32cce7525;p=thirdparty%2Flinux.git

Merge branch 'for-7.0-fixes' into for-7.1
---

d78c5bbf098fd93884a5dc05aec045f32cce7525
diff --cc drivers/ata/libata-scsi.c
index 4225c6d7ff359,3b65df914ebbe..00b3ffbfe169a
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@@ -1697,10 -1694,15 +1697,11 @@@ void ata_scsi_requeue_deferred_qc(struc
  	 * do not try to be smart about what to do with this deferred command
  	 * and simply retry it by completing it with DID_SOFT_ERROR.
  	 */
 -	if (!qc)
 -		return;
 -
 -	scmd = qc->scsicmd;
 -	ap->deferred_qc = NULL;
 -	cancel_work(&ap->deferred_qc_work);
 -	ata_qc_free(qc);
 -	scmd->result = (DID_SOFT_ERROR << 16);
 -	scsi_done(scmd);
 +	if (qc) {
 +		ap->deferred_qc = NULL;
++		cancel_work(&ap->deferred_qc_work);
 +		ata_scsi_qc_done(qc, true, DID_SOFT_ERROR << 16);
 +	}
  }
  
  static void ata_scsi_schedule_deferred_qc(struct ata_port *ap)