Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

[karo-tx-linux.git] / drivers / block / amiflop.c

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 5e7d3fe2c13bcef4181abc14a8fb64f5b20b88b6..456c0cc90dcfd58d87de3d34ace5dda354795112 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1769,8 +1769,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;
        }