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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
drivers
/
char
/
sx.c
diff --git
a/drivers/char/sx.c
b/drivers/char/sx.c
index
d7c4165
..
518f2a2
100644
(file)
--- a/
drivers/char/sx.c
+++ b/
drivers/char/sx.c
@@
-1789,7
+1789,7
@@
static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
nbytes - i : SX_CHUNK_SIZE)) {
kfree(tmp);
rc = -EFAULT;
-
break
;
+
goto out
;
}
memcpy_toio(board->base2 + offset + i, tmp,
(i + SX_CHUNK_SIZE > nbytes) ?