diff options
-rw-r--r-- | drivers/ssb/main.c | 2 | ||||
-rw-r--r-- | include/linux/ssb/ssb.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 51275aac5b34..a732b396e602 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -486,6 +486,7 @@ static int ssb_devices_register(struct ssb_bus *bus) | |||
486 | #ifdef CONFIG_SSB_PCIHOST | 486 | #ifdef CONFIG_SSB_PCIHOST |
487 | sdev->irq = bus->host_pci->irq; | 487 | sdev->irq = bus->host_pci->irq; |
488 | dev->parent = &bus->host_pci->dev; | 488 | dev->parent = &bus->host_pci->dev; |
489 | sdev->dma_dev = dev->parent; | ||
489 | #endif | 490 | #endif |
490 | break; | 491 | break; |
491 | case SSB_BUSTYPE_PCMCIA: | 492 | case SSB_BUSTYPE_PCMCIA: |
@@ -501,6 +502,7 @@ static int ssb_devices_register(struct ssb_bus *bus) | |||
501 | break; | 502 | break; |
502 | case SSB_BUSTYPE_SSB: | 503 | case SSB_BUSTYPE_SSB: |
503 | dev->dma_mask = &dev->coherent_dma_mask; | 504 | dev->dma_mask = &dev->coherent_dma_mask; |
505 | sdev->dma_dev = dev; | ||
504 | break; | 506 | break; |
505 | } | 507 | } |
506 | 508 | ||
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index a2608bff9c78..0d5f04316b35 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h | |||
@@ -167,7 +167,7 @@ struct ssb_device { | |||
167 | * is an optimization. */ | 167 | * is an optimization. */ |
168 | const struct ssb_bus_ops *ops; | 168 | const struct ssb_bus_ops *ops; |
169 | 169 | ||
170 | struct device *dev; | 170 | struct device *dev, *dma_dev; |
171 | 171 | ||
172 | struct ssb_bus *bus; | 172 | struct ssb_bus *bus; |
173 | struct ssb_device_id id; | 173 | struct ssb_device_id id; |