Merge branch 'topic/quirk-cleanup' into topic/hda

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 403dbe781122..a58993011edb 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -329,9 +329,6 @@ struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type)
         struct dma_chan *chan;
         int cpu;
 
-        WARN_ONCE(dmaengine_ref_count == 0,
-                  "client called %s without a reference", __func__);
-
         cpu = get_cpu();
         chan = per_cpu_ptr(channel_table[tx_type], cpu)->chan;
         put_cpu();
@@ -348,9 +345,6 @@ void dma_issue_pending_all(void)
         struct dma_device *device;
         struct dma_chan *chan;
 
-        WARN_ONCE(dmaengine_ref_count == 0,
-                  "client called %s without a reference", __func__);
-
         rcu_read_lock();
         list_for_each_entry_rcu(device, &dma_device_list, global_node) {
                 if (dma_has_cap(DMA_PRIVATE, device->cap_mask))
@@ -961,6 +955,8 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx)
         if (!dep)
                 return;
 
+        /* we'll submit tx->next now, so clear the link */
+        tx->next = NULL;
         chan = dep->chan;
 
         /* keep submitting up until a channel switch is detected