diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/cramfs/uncompress.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/cramfs/uncompress.c')
| -rw-r--r-- | fs/cramfs/uncompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index fc3ccb74626f..023329800d2e 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c | |||
| @@ -50,7 +50,7 @@ int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen) | |||
| 50 | err: | 50 | err: |
| 51 | printk("Error %d while decompressing!\n", err); | 51 | printk("Error %d while decompressing!\n", err); |
| 52 | printk("%p(%d)->%p(%d)\n", src, srclen, dst, dstlen); | 52 | printk("%p(%d)->%p(%d)\n", src, srclen, dst, dstlen); |
| 53 | return 0; | 53 | return -EIO; |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | int cramfs_uncompress_init(void) | 56 | int cramfs_uncompress_init(void) |