git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
sound
/
core
/
info.c
diff --git
a/sound/core/info.c
b/sound/core/info.c
index
35df614
..
d749a0d
100644
(file)
--- a/
sound/core/info.c
+++ b/
sound/core/info.c
@@
-88,12
+88,10
@@
static int resize_info_buffer(struct snd_info_buffer *buffer,
char *nbuf;
nsize = PAGE_ALIGN(nsize);
char *nbuf;
nsize = PAGE_ALIGN(nsize);
- nbuf = k
malloc(
nsize, GFP_KERNEL);
+ nbuf = k
realloc(buffer->buffer,
nsize, GFP_KERNEL);
if (! nbuf)
return -ENOMEM;
if (! nbuf)
return -ENOMEM;
- memcpy(nbuf, buffer->buffer, buffer->len);
- kfree(buffer->buffer);
buffer->buffer = nbuf;
buffer->len = nsize;
return 0;
buffer->buffer = nbuf;
buffer->len = nsize;
return 0;
@@
-108,7
+106,7
@@
static int resize_info_buffer(struct snd_info_buffer *buffer,
*
* Returns the size of output string.
*/
*
* Returns the size of output string.
*/
-int snd_iprintf(struct snd_info_buffer *buffer, c
har *fmt,
...)
+int snd_iprintf(struct snd_info_buffer *buffer, c
onst char *fmt,
...)
{
va_list args;
int len, res;
{
va_list args;
int len, res;
@@
-727,7
+725,7
@@
EXPORT_SYMBOL(snd_info_get_line);
* Returns the updated pointer of the original string so that
* it can be used for the next call.
*/
* Returns the updated pointer of the original string so that
* it can be used for the next call.
*/
-c
har *snd_info_get_str(char *dest,
char *src, int len)
+c
onst char *snd_info_get_str(char *dest, const
char *src, int len)
{
int c;
{
int c;