diff options
| author | Pyun YongHyeon <yongari@FreeBSD.org> | 2005-02-28 05:14:45 +0000 |
|---|---|---|
| committer | Pyun YongHyeon <yongari@FreeBSD.org> | 2005-02-28 05:14:45 +0000 |
| commit | a7e943a456cb6d7af392834ffb2304db509422bf (patch) | |
| tree | a73245d9ac5929df51d344099fdbca1568c9d736 /sys/dev/fdc | |
| parent | bc8652a15ab08b7686c6fe327a2c911377fca022 (diff) | |
| download | src-a7e943a456cb6d7af392834ffb2304db509422bf.tar.gz src-a7e943a456cb6d7af392834ffb2304db509422bf.zip | |
Add missing va_end() in fdc_cmd.
0 -> NULL in arguments of fdc_sense_int().
Reminded by: joerg
Notes
Notes:
svn path=/head/; revision=142750
Diffstat (limited to 'sys/dev/fdc')
| -rw-r--r-- | sys/dev/fdc/fdc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 22124cb7d1e5..5a3a69e5aa33 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -469,6 +469,7 @@ fdc_cmd(struct fdc_data *fdc, int n_out, ...) "cmd %x failed at out byte %d of %d\n", cmd, n + 1, n_out); fdc->flags |= FDC_NEEDS_RESET; + va_end(ap); return fdc_err(fdc, msg); } } @@ -481,9 +482,11 @@ fdc_cmd(struct fdc_data *fdc, int n_out, ...) "cmd %02x failed at in byte %d of %d\n", cmd, n + 1, n_in); fdc->flags |= FDC_NEEDS_RESET; + va_end(ap); return fdc_err(fdc, msg); } } + va_end(ap); return (0); } @@ -1877,7 +1880,7 @@ fd_probe(device_t dev) /* ...wait a moment... */ DELAY(300000); /* make ctrlr happy: */ - fdc_sense_int(fdc, 0, 0); + fdc_sense_int(fdc, NULL, NULL); } } @@ -1894,7 +1897,7 @@ fd_probe(device_t dev) DELAY(i == 0 ? 1000000 : 300000); /* anything responding? */ - if (fdc_sense_int(fdc, &st0, 0) == 0 && + if (fdc_sense_int(fdc, &st0, NULL) == 0 && (st0 & NE7_ST0_EC) == 0) break; /* already probed succesfully */ } |