git.samba.org
/
sfrench
/
cifs-2.6.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/linville/wirel...
[sfrench/cifs-2.6.git]
/
drivers
/
mtd
/
devices
/
slram.c
diff --git
a/drivers/mtd/devices/slram.c
b/drivers/mtd/devices/slram.c
index 8f52fc858e48bec08f900963996c0d37bd4601cb..5a5cd2ace4a6b05126e642e06d04950f52108ab8 100644
(file)
--- a/
drivers/mtd/devices/slram.c
+++ b/
drivers/mtd/devices/slram.c
@@
-240,7
+240,7
@@
static int parse_cmdline(char *devname, char *szstart, char *szlength)
if (*(szlength) != '+') {
devlength = simple_strtoul(szlength, &buffer, 0);
- devlength = handle_unit(devlength, buffer)
- devstart
;
+ devlength = handle_unit(devlength, buffer);
if (devlength < devstart)
goto err_out;