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

In case we loose a device during reset in reinit() finish off

Browse Source 
the request with error instead of loosing it.
This commit is contained in:
Søren Schmidt 2003-10-07 13:44:15 +00:00
parent f1b9e7798d
commit e203a01fad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=120880
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/ata/ata-all.c
View File

@ -221,8 +221,9 @@ ata_detach(device_t dev)
int
ata_reinit(struct ata_channel *ch)
{
struct ata_request *request = ch->running;
int devices, misdev, newdev;
if (!ch->r_irq)
return ENXIO;
@ -237,11 +238,29 @@ ata_reinit(struct ata_channel *ch)
/* detach what left the channel during reset */
if ((misdev = devices & ~ch->devices)) {
if ((misdev & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) &&
ch->device[MASTER].detach)
ch->device[MASTER].detach) {
if (request && (request->device == &ch->device[MASTER])) {
request->result = ENXIO;
request->flags |= ATA_R_DONE;
if (request->callback)
(request->callback)(request);
else
wakeup(request);
}
ch->device[MASTER].detach(&ch->device[MASTER]);
}
if ((misdev & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) &&
ch->device[SLAVE].detach)
ch->device[SLAVE].detach) {
if (request && (request->device == &ch->device[SLAVE])) {
request->result = ENXIO;
request->flags |= ATA_R_DONE;
if (request->callback)
(request->callback)(request);
else
wakeup(request);
}
ch->device[SLAVE].detach(&ch->device[SLAVE]);
}
}
/* identify whats present on this channel now */