diff options
| author | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
|---|---|---|
| committer | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
| commit | d3628763db3974826e46a036aa54333147fbe238 (patch) | |
| tree | ba998dfb4fcad03e00a5cbf58e2a0ad648bab6e6 /sys/dev | |
| parent | 67eb1e0ed1fb11c703392e562440c67d3b44b094 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/de/if_de.c | 4 | ||||
| -rw-r--r-- | sys/dev/fdc/fdc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 7a0eee7ca165..756bef0e9e40 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.27 1995/05/26 02:02:44 davidg Exp $ + * $Id: if_de.c,v 1.28.2.1 1995/06/02 10:44:24 davidg Exp $ * */ @@ -916,7 +916,7 @@ tulip_start( addr += slen; clsize = CLBYTES; } - } while ((m0 = m0->m_next) != NULL); + } while ((m0 != NULL) && ((m0 = m0->m_next) != NULL)); /* * The packet exceeds the number of transmit buffer diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index be36035d3d42..3c468238f2ac 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.60 1995/05/09 12:25:52 rgrimes Exp $ + * $Id: fd.c,v 1.61.2.1 1995/06/08 10:26:23 davidg Exp $ * */ @@ -1080,12 +1080,11 @@ fdstrategy(struct buf *bp) fd = &fd_data[fdu]; fdc = fd->fdc; fdcu = fdc->fdcu; - fdblk = 128 << (fd->ft->secsize); #if NFT > 0 if (FDTYPE(minor(bp->b_dev)) & F_TAPE_TYPE) { /* ft tapes do not (yet) support strategy i/o */ - bp->b_error = ENXIO; + bp->b_error = ENODEV; bp->b_flags |= B_ERROR; goto bad; } @@ -1096,6 +1095,7 @@ fdstrategy(struct buf *bp) goto bad; } #endif + fdblk = 128 << (fd->ft->secsize); if (!(bp->b_flags & B_FORMAT)) { if ((fdu >= NFD) || (bp->b_blkno < 0)) { printf( |