Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / wlags49_h2 / wl_profile.c

diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c
index 7a1337db7aa1aa28150c59338a919b51542c4bb3..a459e48c7bf0cfe4a730d660d0948e43233ac8b7 100644 (file)
--- a/drivers/staging/wlags49_h2/wl_profile.c
+++ b/drivers/staging/wlags49_h2/wl_profile.c
@@ -248,7 +248,7 @@ void parse_config(struct net_device *dev)
                } else {
                        DBG_TRACE(DbgInfo, "F/W image file found\n");
 #define DHF_ALLOC_SIZE 96000                   /* just below 96K, let's hope it suffices for now and for the future */
-                       cp = (char *)vmalloc(DHF_ALLOC_SIZE);
+                       cp = vmalloc(DHF_ALLOC_SIZE);
                        if (cp == NULL) {
                                DBG_ERROR(DbgInfo, "error in vmalloc\n");
                        } else {