mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/q40: Enable PC parallel port in defconfig m68k/q40: Undefine insl/outsl before redefining them m68k/uaccess: Fix asm constraints for userspace access swim: Release memory region after incorrect return/goto m68k/irq: Vector ints need a valid interrupt handler m68k/math-emu: unsigned issue, 'unsigned long' will never be less than zero m68k: remove CONFIG_EARLY_PRINTK dependency on CONFIG_EMBEDDED, default to n m68k/sun3: remove inline marking of EXPORT_SYMBOL functions [SCSI] a3000: use module_platform_driver_probe() [SCSI] a4000t: use module_platform_driver_probe() m68k: Remove inline strcpy() and strcat() implementations
This commit is contained in:
commit
0e97456ab5
15 changed files with 25 additions and 94 deletions
|
|
@ -893,7 +893,7 @@ static int swim_probe(struct platform_device *dev)
|
|||
|
||||
swim_base = ioremap(res->start, resource_size(res));
|
||||
if (!swim_base) {
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto out_release_io;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue