|
@@ -1841,34 +1841,26 @@ no_rtc:
|
|
|
if (dma < 1)
|
|
|
goto no_dma; /* DMA disabled */
|
|
|
if (((1 << dma) & this_board->DMAbits) == 0) {
|
|
|
- printk(", DMA is out of allowed range, FAIL!\n");
|
|
|
+ printk(KERN_ERR "DMA is out of allowed range, FAIL!\n");
|
|
|
return -EINVAL; /* Bad DMA */
|
|
|
}
|
|
|
ret = request_dma(dma, "pcl818");
|
|
|
- if (ret) {
|
|
|
- printk(", unable to allocate DMA %u, FAIL!\n", dma);
|
|
|
+ if (ret)
|
|
|
return -EBUSY; /* DMA isn't free */
|
|
|
- }
|
|
|
devpriv->dma = dma;
|
|
|
- printk(", dma=%u", dma);
|
|
|
pages = 2; /* we need 16KB */
|
|
|
devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
|
|
|
- if (!devpriv->dmabuf[0]) {
|
|
|
- printk(", unable to allocate DMA buffer, FAIL!\n");
|
|
|
+ if (!devpriv->dmabuf[0])
|
|
|
/* maybe experiment with try_to_free_pages() will help .... */
|
|
|
return -EBUSY; /* no buffer :-( */
|
|
|
- }
|
|
|
devpriv->dmapages[0] = pages;
|
|
|
devpriv->hwdmaptr[0] = virt_to_bus((void *)devpriv->dmabuf[0]);
|
|
|
devpriv->hwdmasize[0] = (1 << pages) * PAGE_SIZE;
|
|
|
/* printk("%d %d %ld, ",devpriv->dmapages[0],devpriv->hwdmasize[0],PAGE_SIZE); */
|
|
|
if (devpriv->dma_rtc == 0) { /* we must do duble buff :-( */
|
|
|
devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
|
|
|
- if (!devpriv->dmabuf[1]) {
|
|
|
- printk
|
|
|
- (", unable to allocate DMA buffer, FAIL!\n");
|
|
|
+ if (!devpriv->dmabuf[1])
|
|
|
return -EBUSY;
|
|
|
- }
|
|
|
devpriv->dmapages[1] = pages;
|
|
|
devpriv->hwdmaptr[1] =
|
|
|
virt_to_bus((void *)devpriv->dmabuf[1]);
|