Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[mv-sheeva.git] / sound / oss / hal2.c

diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c
index 784bdd707055ede1e4ae3cdf176fd3ba262e26d1..d18286ccc14d244ee18d55b9ac9d04c48b0c2c50 100644 (file)
--- a/sound/oss/hal2.c
+++ b/sound/oss/hal2.c
@@ -1435,7 +1435,7 @@ static int hal2_init_card(struct hal2_card **phal2, struct hpc3_regs *hpc3)
        int ret = 0;
        struct hal2_card *hal2;
 
-       hal2 = (struct hal2_card *) kmalloc(sizeof(struct hal2_card), GFP_KERNEL);
+       hal2 = kmalloc(sizeof(struct hal2_card), GFP_KERNEL);
        if (!hal2)
                return -ENOMEM;
        memset(hal2, 0, sizeof(struct hal2_card));