From 54369113852655cb16e24d65ebfb9606b3f2ffae Mon Sep 17 00:00:00 2001 From: Mark Allyn Date: Thu, 9 Dec 2010 09:32:53 -0800 Subject: [PATCH] --- yaml --- r: 228360 b: refs/heads/master c: fd599985e649c71162495d307a2fd1bbddc258e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/sep/sep_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8525ee97a53c..0c77c2f07c02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 653bf0cfa55896b74d8cbe7e561401813ca359ad +refs/heads/master: fd599985e649c71162495d307a2fd1bbddc258e4 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index bb42b048f46a..2681fcf0c34d 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -3442,7 +3442,7 @@ static int __devinit sep_probe(struct pci_dev *pdev, } sep->rar_size = FAKE_RAR_SIZE; - sep->rar_addr = dma_alloc_coherent(NULL, + sep->rar_addr = dma_alloc_coherent(&sep->pdev->dev, sep->rar_size, &sep->rar_bus, GFP_KERNEL); if (sep->rar_addr == NULL) { dev_warn(&sep->pdev->dev, "can't allocate mfld rar\n");