Module Name: src
Committed By: martin
Date: Tue Aug 30 18:28:42 UTC 2022
Modified Files:
src/sys/dev/ata [netbsd-9]: ata.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1512):
sys/dev/ata/ata.c: revision 1.163
Output missing '\n' for capability list when DMA support is not compiled in.
To generate a diff of this commit:
cvs rdiff -u -r1.149.2.1 -r1.149.2.2 src/sys/dev/ata/ata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.149.2.1 src/sys/dev/ata/ata.c:1.149.2.2
--- src/sys/dev/ata/ata.c:1.149.2.1 Tue Mar 15 18:00:26 2022
+++ src/sys/dev/ata/ata.c Tue Aug 30 18:28:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.149.2.1 2022/03/15 18:00:26 martin Exp $ */
+/* $NetBSD: ata.c,v 1.149.2.2 2022/08/30 18:28:42 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.149.2.1 2022/03/15 18:00:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.149.2.2 2022/08/30 18:28:42 martin Exp $");
#include "opt_ata.h"
@@ -2033,9 +2033,7 @@ ata_probe_caps(struct ata_drive_datas *d
#if NATA_DMA
if ((atac->atac_cap & ATAC_CAP_DMA) == 0) {
/* don't care about DMA modes */
- if (*sep != '\0')
- aprint_verbose("\n");
- return;
+ goto out;
}
if (cf_flags & ATA_CONFIG_DMA_SET) {
ata_channel_lock(chp);
@@ -2081,13 +2079,10 @@ ata_probe_caps(struct ata_drive_datas *d
}
ata_channel_unlock(chp);
- if (*sep != '\0')
- aprint_verbose("\n");
-
#if NATA_UDMA
if ((atac->atac_cap & ATAC_CAP_UDMA) == 0) {
/* don't care about UDMA modes */
- return;
+ goto out;
}
if (cf_flags & ATA_CONFIG_UDMA_SET) {
ata_channel_lock(chp);
@@ -2102,7 +2097,10 @@ ata_probe_caps(struct ata_drive_datas *d
ata_channel_unlock(chp);
}
#endif /* NATA_UDMA */
+out:
#endif /* NATA_DMA */
+ if (*sep != '\0')
+ aprint_verbose("\n");
}
/* management of the /dev/atabus* devices */
