| commit | 92d4c21e51fc12736c39c2a161a42f20e2be8a00 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| tree | 0ea63b023a85dff7aeb0895b46d3b22a65669ae1 | |
| parent | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 [diff] |
Update Linux to v5.10.157 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.157.tar.xz Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I7b30d9e98d8c465d6b44de8e7433b4a40b3289ba
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 8b9a390..a1a06a8 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c
@@ -202,7 +202,7 @@ task->total_xfer_len = qc->nbytes; task->num_scatter = qc->n_elem; task->data_dir = qc->dma_dir; - } else if (qc->tf.protocol == ATA_PROT_NODATA) { + } else if (!ata_is_data(qc->tf.protocol)) { task->data_dir = DMA_NONE; } else { for_each_sg(qc->sg, sg, qc->n_elem, si)
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 8d6bcc1..51485d0 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c
@@ -85,7 +85,7 @@ res = i->dft->lldd_execute_task(task, GFP_KERNEL); if (res) { - del_timer(&task->slow_task->timer); + del_timer_sync(&task->slow_task->timer); pr_notice("executing SMP task failed:%d\n", res); break; }