From bf0cc45bdd88b97514953bf498a71d9ddd21aed0 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 3 Jun 2010 19:37:27 -0700 Subject: [PATCH] --- yaml --- r: 202855 b: refs/heads/master c: 14f92952bf74a365ca7f9dfbec158e7c933ea723 h: refs/heads/master i: 202853: 374e8107a1c02d3fa48b1ccf89432bb03448845d 202851: 8cacaa440f640dd9499a0f524aaee8079a9e3921 202847: 7ad27d0e12c213987c4bf90a318221c947585f57 v: v3 --- [refs] | 2 +- trunk/drivers/ssb/main.c | 2 ++ trunk/include/linux/ssb/ssb.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9cd088565464..a9faa5bbcc95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e724443f328cca90aa3b62d65852a5d7f5223f7 +refs/heads/master: 14f92952bf74a365ca7f9dfbec158e7c933ea723 diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c index 51275aac5b34..a732b396e602 100644 --- a/trunk/drivers/ssb/main.c +++ b/trunk/drivers/ssb/main.c @@ -486,6 +486,7 @@ static int ssb_devices_register(struct ssb_bus *bus) #ifdef CONFIG_SSB_PCIHOST sdev->irq = bus->host_pci->irq; dev->parent = &bus->host_pci->dev; + sdev->dma_dev = dev->parent; #endif break; case SSB_BUSTYPE_PCMCIA: @@ -501,6 +502,7 @@ static int ssb_devices_register(struct ssb_bus *bus) break; case SSB_BUSTYPE_SSB: dev->dma_mask = &dev->coherent_dma_mask; + sdev->dma_dev = dev; break; } diff --git a/trunk/include/linux/ssb/ssb.h b/trunk/include/linux/ssb/ssb.h index a2608bff9c78..0d5f04316b35 100644 --- a/trunk/include/linux/ssb/ssb.h +++ b/trunk/include/linux/ssb/ssb.h @@ -167,7 +167,7 @@ struct ssb_device { * is an optimization. */ const struct ssb_bus_ops *ops; - struct device *dev; + struct device *dev, *dma_dev; struct ssb_bus *bus; struct ssb_device_id id;