summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 11:11:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 11:11:23 -0700
commit0e97456ab5ba2761892d9e67b7e3b0cac262141c (patch)
tree440d4a2ad18ceae512876aee24866a12ee2ea626 /drivers/block
parent76d3f4c27d3c2c85e5cfe731537b6929145bf652 (diff)
parent980f3a7315b4691ec90538352a9e9c5a53ea9d34 (diff)
downloadlinux-0e97456ab5ba2761892d9e67b7e3b0cac262141c.tar.bz2
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
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/swim.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 2f445b7a174e..8ed6ccb748cf 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -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;
}