diff --git a/[refs] b/[refs] index 06cb69d50d50..fc31ef0590f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dd145252574e34d92ad574e5168e4115639c0be +refs/heads/master: 88b386c0a7c278581d2b8e2c2761d12f6475938d diff --git a/trunk/drivers/dma/of-dma.c b/trunk/drivers/dma/of-dma.c index 583e50e3d47c..69d04d28b1ef 100644 --- a/trunk/drivers/dma/of-dma.c +++ b/trunk/drivers/dma/of-dma.c @@ -118,7 +118,9 @@ int of_dma_controller_register(struct device_node *np, ofdma->use_count = 0; /* Now queue of_dma controller structure in list */ + spin_lock(&of_dma_lock); list_add_tail(&ofdma->of_dma_controllers, &of_dma_list); + spin_unlock(&of_dma_lock); return 0; }