Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273878
b: refs/heads/master
c: 36e2f21
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer authored and Vinod Koul committed Aug 29, 2011
1 parent e359f0d commit 072e072
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 73eab978ad6934499b83ecc920d470fe99c5e54d
refs/heads/master: 36e2f21ab481b3d6bd31b99e1de669fbbac4bd0e
6 changes: 6 additions & 0 deletions trunk/drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,7 @@ static int __init sdma_probe(struct platform_device *pdev)
struct sdma_platform_data *pdata = pdev->dev.platform_data;
int i;
struct sdma_engine *sdma;
s32 *saddr_arr;

sdma = kzalloc(sizeof(*sdma), GFP_KERNEL);
if (!sdma)
Expand Down Expand Up @@ -1324,6 +1325,11 @@ static int __init sdma_probe(struct platform_device *pdev)
goto err_alloc;
}

/* initially no scripts available */
saddr_arr = (s32 *)sdma->script_addrs;
for (i = 0; i < SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1; i++)
saddr_arr[i] = -EINVAL;

if (of_id)
pdev->id_entry = of_id->data;
sdma->devtype = pdev->id_entry->driver_data;
Expand Down

0 comments on commit 072e072

Please sign in to comment.