1 files changed, 9 insertions, 5 deletions

diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 5861f234af21..f3037402d58f 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -303,18 +303,22 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 {
         dmab->dev.type = SNDRV_DMA_TYPE_DEV;
         dmab->dev.dev = snd_dma_pci_data(pci);
-        if (! snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
-                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                                        size, dmab) < 0)
-                        return -ENOMEM;
+        if (snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
+                if (dmab->bytes >= size)
+                        return 0;
         }
+        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                                size, dmab) < 0)
+                return -ENOMEM;
         return 0;
 }
 
 static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)
 {
-        if (dmab->area)
+        if (dmab->area) {
+                dmab->dev.dev = NULL; /* make it anonymous */
                 snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci));
+        }
 }