Browse Source

Merge branch 'topic/core' into for-linus

Vinod Koul 9 years ago
parent
commit
99823374d3
1 changed files with 7 additions and 0 deletions
  1. 7 0
      drivers/dma/dmaengine.c

+ 7 - 0
drivers/dma/dmaengine.c

@@ -997,6 +997,13 @@ int dma_async_device_register(struct dma_device *device)
 		}
 		chan->client_count = 0;
 	}
+
+	if (!chancnt) {
+		dev_err(device->dev, "%s: device has no channels!\n", __func__);
+		rc = -ENODEV;
+		goto err_out;
+	}
+
 	device->chancnt = chancnt;
 
 	mutex_lock(&dma_list_mutex);