From a91ef50a1f46f5b567f68890d7618aeae8bd186a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 14 Aug 2009 15:40:32 +0100 Subject: [PATCH] --- yaml --- r: 162385 b: refs/heads/master c: c7b7556245f3d0e825bf5c73dd9380b6b26737c5 h: refs/heads/master i: 162383: b522e673e264a86010b3fc397e29fbdafea6a615 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 c3acbb2ab431..e62c2edfc6e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad6b9ab7a3ef6818a7b10e1202a0fb62fe242aeb +refs/heads/master: c7b7556245f3d0e825bf5c73dd9380b6b26737c5 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index 531814bdbb09..0302c3c93c1a 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -277,7 +277,7 @@ static int sep_map_and_alloc_shared_area(struct sep_device *sep, unsigned long size) { /* shared_addr = ioremap_nocache(0xda00000,shared_area_size); */ - sep->shared_area = dma_alloc_coherent(&sep->pdev->dev, size, + sep->shared_addr = dma_alloc_coherent(&sep->pdev->dev, size, &sep->shared_bus, GFP_KERNEL); if (!sep->shared_addr) {