aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 19:08:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 19:08:03 -0700
commitdc113c1f1d4b47af1b1ca701c5a39e24d296c2ac (patch)
tree0bb5ce21bcd41a9443708567edbdca80d9a72397 /drivers/block
parent63a93699c6a58795b854ff573542a08367684dae (diff)
parent059718d572e8ad388313b863aff717623bb2552f (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast m68k/atari: ARAnyM - Add support for network access m68k/atari: ARAnyM - Add support for console access m68k/atari: ARAnyM - Add support for block access m68k/atari: Initial ARAnyM support m68k: Kconfig - Remove unneeded "default n" m68k: Makefiles - Change to new flags variables m68k/amiga: Reclaim Chip RAM for PPC exception handlers m68k: Allow all kernel traps to be handled via exception fixups m68k: Use base_trap_init() to initialize vectors m68k: Add helper function handle_kernel_fault()
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/amiflop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 7888501ad9e..363855ca376 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1768,8 +1768,8 @@ static int __init amiga_floppy_probe(struct platform_device *pdev)
return -EBUSY;
ret = -ENOMEM;
- if ((raw_buf = (char *)amiga_chip_alloc (RAW_BUF_SIZE, "Floppy")) ==
- NULL) {
+ raw_buf = amiga_chip_alloc(RAW_BUF_SIZE, "Floppy");
+ if (!raw_buf) {
printk("fd: cannot get chip mem buffer\n");
goto out_blkdev;
}