Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261135
b: refs/heads/master
c: 40ad5b3
h: refs/heads/master
i:
  261133: 9ebd781
  261131: 98d84c3
  261127: 029b812
  261119: c7ba6ce
v: v3
  • Loading branch information
Shawn Guo committed Jul 27, 2011
1 parent b5cc58c commit 710fdcd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62550cd7c08f1a38d0ade1de18baec10f83412bb
refs/heads/master: 40ad5b37914368a4f2c5ff1e72712375d6f1188b
12 changes: 2 additions & 10 deletions trunk/drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1126,22 +1126,14 @@ static int __init sdma_get_firmware(struct sdma_engine *sdma,
const char *fw_name)
{
const struct firmware *fw;
char *fwname;
const struct sdma_firmware_header *header;
int ret;
const struct sdma_script_start_addrs *addr;
unsigned short *ram_code;

fwname = kasprintf(GFP_KERNEL, "%s", fw_name);
if (!fwname)
return -ENOMEM;

ret = request_firmware(&fw, fwname, sdma->dev);
if (ret) {
kfree(fwname);
ret = request_firmware(&fw, fw_name, sdma->dev);
if (ret)
return ret;
}
kfree(fwname);

if (fw->size < sizeof(*header))
goto err_firmware;
Expand Down

0 comments on commit 710fdcd

Please sign in to comment.