Attachment 194421 Details for Bug 288961 – Proposed patch

[patch] Proposed patch

patch.txt (text/plain), 1.34 KB, created by Mark J. Cox on 2007-09-13 08:33:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark J. Cox

Created: 2007-09-13 08:33:29 UTC

Size: 1.34 KB

patch

obsolete

>
>
>[PATCH] Fix /proc/drivers/snd-page-alloc proc read
>
>Fix the broken proc_read implementation for
>/proc/drivers/snd-page-alloc file.
>
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>--
>diff -r 9fe2d7b6498b core/memalloc.c
>--- a/sound/core/memalloc.c	Wed Sep 12 13:31:47 2007 +0200
>+++ b/sound/core/memalloc.c	Thu Sep 13 02:17:21 2007 +0200
>@@ -497,21 +497,27 @@ static int snd_mem_proc_read(char *page,
> 	static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" };
> 
> 	mutex_lock(&list_mutex);
>-	len += snprintf(page + len, count - len,
>+	len += scnprintf(page + len, PAGE_SIZE - len,
> 			"pages  : %li bytes (%li pages per %likB)\n",
> 			pages * PAGE_SIZE, pages, PAGE_SIZE / 1024);
> 	devno = 0;
> 	list_for_each_entry(mem, &mem_list_head, list) {
> 		devno++;
>-		len += snprintf(page + len, count - len,
>+		len += scnprintf(page + len, PAGE_SIZE - len,
> 				"buffer %d : ID %08x : type %s\n",
> 				devno, mem->id, types[mem->buffer.dev.type]);
>-		len += snprintf(page + len, count - len,
>+		len += scnprintf(page + len, PAGE_SIZE - len,
> 				"  addr = 0x%lx, size = %d bytes\n",
> 				(unsigned long)mem->buffer.addr, (int)mem->buffer.bytes);
> 	}
> 	mutex_unlock(&list_mutex);
>-	return len;
>+	*start = page + off;
>+	if (len > off + count)
>+		return count;
>+	*eof = 1;
>+	if (len < off)
>+		return 0;
>+	return len - off;
> }
> 
> /* FIXME: for pci only - other bus? */
>

Actions: View | Diff

Attachments on bug 288961: 194421