aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-12-27 20:59:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-28 19:09:17 +0100
commit32c74552b2310531af593ee0f859a3935a3a7cbd (patch)
treeaeb837d705ab8556336ca7cfe98a9e01f985d5d0 /target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
parenta8ad881b830fe00bd2036c281693849d8f45c91a (diff)
downloadupstream-32c74552b2310531af593ee0f859a3935a3a7cbd.tar.gz
upstream-32c74552b2310531af593ee0f859a3935a3a7cbd.tar.bz2
upstream-32c74552b2310531af593ee0f859a3935a3a7cbd.zip
kernel: bump 5.4 to 5.4.168
All updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch')
-rw-r--r--target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch b/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
index bec9363fa1..c4cbaaa777 100644
--- a/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
+++ b/target/linux/generic/pending-5.4/820-libata-Assign-OF-node-to-the-SCSI-device.patch
@@ -41,7 +41,7 @@ ChangeLog v1->v2:
#include "libata.h"
#include "libata-transport.h"
-@@ -4579,6 +4580,34 @@ int ata_scsi_add_hosts(struct ata_host *
+@@ -4590,6 +4591,34 @@ int ata_scsi_add_hosts(struct ata_host *
return rc;
}
@@ -76,7 +76,7 @@ ChangeLog v1->v2:
void ata_scsi_scan_host(struct ata_port *ap, int sync)
{
int tries = 5;
-@@ -4604,6 +4633,7 @@ void ata_scsi_scan_host(struct ata_port
+@@ -4615,6 +4644,7 @@ void ata_scsi_scan_host(struct ata_port
NULL);
if (!IS_ERR(sdev)) {
dev->sdev = sdev;