diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-07-11 10:28:26 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-07-11 11:04:10 -0300 |
| commit | ef34a57a8c6b87bab813b422d70f86a5508f48b1 (patch) | |
| tree | 0e29e01f16e5fe8076e2ea37f04b8b898ee7a837 /drivers/ata | |
| parent | 6d5d44ccd4eb52e4e467fb61c20d3c2c7d220d2b (diff) | |
| parent | 27d3c1285087ff6741551be8272c438ec8d56b80 (diff) | |
Merge branch 'local/v5.15.34' into 5.15.32-2.0.0
Reverted commit due to conflict:
ff13c90d7f7ab606b37be6d15140d19013d6736c drm/bridge: Add missing pm_runtime_put_sync
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_dwc_460ex.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index 338c2e50f759..29e2b0dfba30 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c @@ -145,7 +145,11 @@ struct sata_dwc_device { #endif }; -#define SATA_DWC_QCMD_MAX 32 +/* + * Allow one extra special slot for commands and DMA management + * to account for libata internal commands. + */ +#define SATA_DWC_QCMD_MAX (ATA_MAX_QUEUE + 1) struct sata_dwc_device_port { struct sata_dwc_device *hsdev; |