Module Name: src
Committed By: martin
Date: Sat Mar 26 17:14:38 UTC 2016
Modified Files:
src/sys/arch/newsmips/dev: scsi_1185.c
Log Message:
David Binderman in PR port-newsmips/51014:
Move initialization of remain_cnt up to the declaration.
XXX the #ifdef here does not make much sense to me, but I know nothing
about the hardware. I'd guess it could be removed or inverted and #error'd
instead.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/newsmips/dev/scsi_1185.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/arch/newsmips/dev/scsi_1185.c
diff -u src/sys/arch/newsmips/dev/scsi_1185.c:1.21 src/sys/arch/newsmips/dev/scsi_1185.c:1.22
--- src/sys/arch/newsmips/dev/scsi_1185.c:1.21 Mon Mar 24 20:05:20 2014
+++ src/sys/arch/newsmips/dev/scsi_1185.c Sat Mar 26 17:14:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_1185.c,v 1.21 2014/03/24 20:05:20 christos Exp $ */
+/* $NetBSD: scsi_1185.c,v 1.22 2016/03/26 17:14:38 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.21 2014/03/24 20:05:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.22 2016/03/26 17:14:38 martin Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -1720,12 +1720,11 @@ void
adjust_transfer(struct sc_softc *sc, struct sc_chan_stat *cs)
{
struct sc_scb *scb = cs->scb;
- u_int remain_cnt;
+ u_int remain_cnt = 0;
u_int offset, sent_byte;
if (sc->pad_start) {
sc->pad_start = 0;
- remain_cnt = 0;
} else {
# if defined(__mips__) && defined(CPU_SINGLE)
remain_cnt = GET_CNT();
