sim-card
/
qemu
Archived
10
0
Fork 0

Really stop the transfer when the DMA channel is being disabled.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3987 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-02-23 02:08:35 +00:00
parent b1314cf9d3
commit f65fb10982
1 changed files with 3 additions and 2 deletions

View File

@ -583,12 +583,13 @@ static void omap_dma_deactivate_channel(struct omap_dma_s *s,
if (ch->pending_request && !ch->waiting_end_prog) {
/* Don't deactivate the channel */
ch->pending_request = 0;
return;
if (ch->enable)
return;
}
/* Don't deactive the channel if it is synchronized and the DMA request is
active */
if (ch->sync && (s->drq & (1 << ch->sync)))
if (ch->sync && (s->drq & (1 << ch->sync)) && ch->enable)
return;
if (ch->active) {