Merge remote-tracking branch 'kwolf/for-anthony' into staging

This commit is contained in:
Anthony Liguori 2011-09-20 15:21:03 -05:00
commit c8af89af96
18 changed files with 254 additions and 177 deletions

View file

@ -603,7 +603,7 @@ handle_rw_error:
break;
case IDE_DMA_TRIM:
s->bus->dma->aiocb = dma_bdrv_io(s->bs, &s->sg, sector_num,
ide_issue_trim, ide_dma_cb, s, 1);
ide_issue_trim, ide_dma_cb, s, true);
break;
}