Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / drivers / isdn / hisax / hfc_sx.c

diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index 90f34ae2b80fb340401abbe0c9941a3a95cfc736..dc4574f735ef59f24fecbeaf576e58280a56404f 100644 (file)
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1479,7 +1479,7 @@ int setup_hfcsx(struct IsdnCard *card)
                        release_region(cs->hw.hfcsx.base, 2);
                        return (0);
                }
-               if (!(cs->hw.hfcsx.extra = (void *)
+               if (!(cs->hw.hfcsx.extra =
                      kmalloc(sizeof(struct hfcsx_extra), GFP_ATOMIC))) {
                        release_region(cs->hw.hfcsx.base, 2);
                        printk(KERN_WARNING "HFC-SX: unable to allocate memory\n");