Module Name: src Committed By: joerg Date: Sun Oct 8 21:18:14 UTC 2017
Modified Files: src/sys/dev/ic: mvsata.c src/sys/dev/scsipi: atapi_wdc.c Log Message: Initialize tfd even when not waiting for DSC. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/dev/ic/mvsata.c cvs rdiff -u -r1.124 -r1.125 src/sys/dev/scsipi/atapi_wdc.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/ic/mvsata.c diff -u src/sys/dev/ic/mvsata.c:1.36 src/sys/dev/ic/mvsata.c:1.37 --- src/sys/dev/ic/mvsata.c:1.36 Sat Oct 7 16:05:32 2017 +++ src/sys/dev/ic/mvsata.c Sun Oct 8 21:18:14 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsata.c,v 1.36 2017/10/07 16:05:32 jdolecek Exp $ */ +/* $NetBSD: mvsata.c,v 1.37 2017/10/08 21:18:14 joerg 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.36 2017/10/07 16:05:32 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.37 2017/10/08 21:18:14 joerg Exp $"); #include "opt_mvsata.h" @@ -2609,7 +2609,7 @@ mvsata_atapi_phase_complete(struct ata_x struct wdc_softc *wdc = CHAN_TO_WDC(chp); struct scsipi_xfer *sc_xfer = xfer->c_scsipi; struct ata_drive_datas *drvp = &chp->ch_drive[xfer->c_drive]; - int tfd; + int tfd = 0; ata_channel_lock_owned(chp); Index: src/sys/dev/scsipi/atapi_wdc.c diff -u src/sys/dev/scsipi/atapi_wdc.c:1.124 src/sys/dev/scsipi/atapi_wdc.c:1.125 --- src/sys/dev/scsipi/atapi_wdc.c:1.124 Sat Oct 7 16:05:33 2017 +++ src/sys/dev/scsipi/atapi_wdc.c Sun Oct 8 21:18:14 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: atapi_wdc.c,v 1.124 2017/10/07 16:05:33 jdolecek Exp $ */ +/* $NetBSD: atapi_wdc.c,v 1.125 2017/10/08 21:18:14 joerg Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.124 2017/10/07 16:05:33 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.125 2017/10/08 21:18:14 joerg Exp $"); #ifndef ATADEBUG #define ATADEBUG @@ -1046,7 +1046,7 @@ wdc_atapi_phase_complete(struct ata_xfer #endif struct scsipi_xfer *sc_xfer = xfer->c_scsipi; struct ata_drive_datas *drvp = &chp->ch_drive[xfer->c_drive]; - int tfd; + int tfd = 0; ata_channel_lock_owned(chp);