Эх сурвалжийг харах

Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of/dma: fix build breakage in ppc4xx adma driver
Linus Torvalds 15 жил өмнө
parent
commit
744c557892

+ 3 - 1
drivers/dma/ppc4xx/adma.c

@@ -4257,10 +4257,12 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
 				     struct ppc440spe_adma_chan *chan,
 				     struct ppc440spe_adma_chan *chan,
 				     int *initcode)
 				     int *initcode)
 {
 {
+	struct of_device *ofdev;
 	struct device_node *np;
 	struct device_node *np;
 	int ret;
 	int ret;
 
 
-	np = container_of(adev->dev, struct of_device, dev)->node;
+	ofdev = container_of(adev->dev, struct of_device, dev);
+	np = ofdev->dev.of_node;
 	if (adev->id != PPC440SPE_XOR_ID) {
 	if (adev->id != PPC440SPE_XOR_ID) {
 		adev->err_irq = irq_of_parse_and_map(np, 1);
 		adev->err_irq = irq_of_parse_and_map(np, 1);
 		if (adev->err_irq == NO_IRQ) {
 		if (adev->err_irq == NO_IRQ) {