diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:08:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 22:08:03 -0400 |
| commit | dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac (patch) | |
| tree | 0bb5ce21bcd41a9443708567edbdca80d9a72397 /drivers/block | |
| parent | 63a93699c6a58795b854ff573542a08367684dae (diff) | |
| parent | 059718d572e8ad388313b863aff717623bb2552f (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 7888501ad9ee..363855ca376e 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) | |||
| 1768 | return -EBUSY; | 1768 | return -EBUSY; |
| 1769 | 1769 | ||
| 1770 | ret = -ENOMEM; | 1770 | ret = -ENOMEM; |
| 1771 | if ((raw_buf = (char *)amiga_chip_alloc (RAW_BUF_SIZE, "Floppy")) == | 1771 | raw_buf = amiga_chip_alloc(RAW_BUF_SIZE, "Floppy"); |
| 1772 | NULL) { | 1772 | if (!raw_buf) { |
| 1773 | printk("fd: cannot get chip mem buffer\n"); | 1773 | printk("fd: cannot get chip mem buffer\n"); |
| 1774 | goto out_blkdev; | 1774 | goto out_blkdev; |
| 1775 | } | 1775 | } |