lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/wm0010' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown
2013-07-31 21:07:23 +01:00
parent 08d0a9757d 4f8b19143d
commit 3fef7f795f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/codecs/wm0010.c
View File

@@ -410,6 +410,16 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
rec->command, rec->length); rec->command, rec->length);
len = rec->length + 8; len = rec->length + 8;
xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);
if (!xfer) {
dev_err(codec->dev, "Failed to allocate xfer\n");
ret = -ENOMEM;
goto abort;
}
xfer->codec = codec;
list_add_tail(&xfer->list, &xfer_list);
out = kzalloc(len, GFP_KERNEL); out = kzalloc(len, GFP_KERNEL);
if (!out) { if (!out) {
dev_err(codec->dev, dev_err(codec->dev,
@@ -417,6 +427,7 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
ret = -ENOMEM; ret = -ENOMEM;
goto abort1; goto abort1;
} }
xfer->t.rx_buf = out;
img = kzalloc(len, GFP_KERNEL); img = kzalloc(len, GFP_KERNEL);
if (!img) { if (!img) {
@@ -425,24 +436,13 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
ret = -ENOMEM; ret = -ENOMEM;
goto abort1; goto abort1;
} }
xfer->t.tx_buf = img;
byte_swap_64((u64 *)&rec->command, img, len); byte_swap_64((u64 *)&rec->command, img, len);
xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);
if (!xfer) {
dev_err(codec->dev, "Failed to allocate xfer\n");
ret = -ENOMEM;
goto abort1;
}
xfer->codec = codec;
list_add_tail(&xfer->list, &xfer_list);
spi_message_init(&xfer->m); spi_message_init(&xfer->m);
xfer->m.complete = wm0010_boot_xfer_complete; xfer->m.complete = wm0010_boot_xfer_complete;
xfer->m.context = xfer; xfer->m.context = xfer;
xfer->t.tx_buf = img;
xfer->t.rx_buf = out;
xfer->t.len = len; xfer->t.len = len;
xfer->t.bits_per_word = 8; xfer->t.bits_per_word = 8;