d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quiet the READ_TOC errors that can appear on empty CDR's.

Browse Source 
Assure cur_write_speed can be no less than 177 to avoid divide by 0 error.
This commit is contained in:
Søren Schmidt 2001-06-07 07:21:20 +00:00
parent 4513fdec5e
commit 4dcb0f16ec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=77864
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ata/atapi-cd.c
View File

@ -1229,7 +1229,7 @@ acd_read_toc(struct acd_softc *cdp)
ccb[7] = len>>8;
ccb[8] = len;
if (atapi_queue_cmd(cdp->atp, ccb, (caddr_t)&cdp->toc, len,
ATPR_F_READ, 30, NULL, NULL)) {
ATPR_F_READ | ATPR_F_QUIET, 30, NULL, NULL)) {
bzero(&cdp->toc, sizeof(cdp->toc));
return;
}
@ -1915,7 +1915,7 @@ acd_get_cap(struct acd_softc *cdp)
cdp->cap.max_read_speed = ntohs(cdp->cap.max_read_speed);
cdp->cap.cur_read_speed = ntohs(cdp->cap.cur_read_speed);
cdp->cap.max_write_speed = ntohs(cdp->cap.max_write_speed);
cdp->cap.cur_write_speed = ntohs(cdp->cap.cur_write_speed);
cdp->cap.cur_write_speed = max(ntohs(cdp->cap.cur_write_speed), 177);
cdp->cap.max_vol_levels = ntohs(cdp->cap.max_vol_levels);
cdp->cap.buf_size = ntohs(cdp->cap.buf_size);
}