diff --git a/[refs] b/[refs] index 597befbccc45..0ae29910c457 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c4e9c84970e555a80a4c92a5a3d3125c63f0e12 +refs/heads/master: 5ef3df5b9fed56e64e8544e36a175354d38d0206 diff --git a/trunk/drivers/staging/wlags49_h2/wl_profile.c b/trunk/drivers/staging/wlags49_h2/wl_profile.c index 7a1337db7aa1..a459e48c7bf0 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_profile.c +++ b/trunk/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 {