Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic Fix obvious copy/paste-induced error (my fault) t...
details: https://anonhg.NetBSD.org/src/rev/321c18fc0be9
branches: trunk
changeset: 780195:321c18fc0be9
user: jakllsch <jakllsch%NetBSD.org@localhost>
date: Sun Jul 15 01:15:03 2012 +0000
description:
Fix obvious copy/paste-induced error (my fault) that would clobber
the bottom 24-bits of r_lba during a LBA48 command with AT_READREG.
diffstat:
sys/dev/ic/mvsata.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 3e7cad83105f -r 321c18fc0be9 sys/dev/ic/mvsata.c
--- a/sys/dev/ic/mvsata.c Sun Jul 15 00:22:58 2012 +0000
+++ b/sys/dev/ic/mvsata.c Sun Jul 15 01:15:03 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $ */
+/* $NetBSD: mvsata.c,v 1.19 2012/07/15 01:15:03 jakllsch Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.19 2012/07/15 01:15:03 jakllsch Exp $");
#include "opt_mvsata.h"
@@ -1739,7 +1739,7 @@
}
ata_c->r_count |=
MVSATA_WDC_READ_1(mvport, SRB_SC) << 8;
- ata_c->r_lba =
+ ata_c->r_lba |=
(uint64_t)MVSATA_WDC_READ_1(mvport, SRB_LBAL) << 24;
ata_c->r_lba |=
(uint64_t)MVSATA_WDC_READ_1(mvport, SRB_LBAM) << 32;
Home |
Main Index |
Thread Index |
Old Index