diff --git a/[refs] b/[refs] index e31d5d38e642..99931cb5735a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65f15e2de870dcd6c843e19eb4960a0ed6f40f6c +refs/heads/master: 8c82b13a2c2b22fc395f39b6aba301e7fbe09440 diff --git a/trunk/drivers/staging/altera-stapl/altera.c b/trunk/drivers/staging/altera-stapl/altera.c index 8d73a8642736..be777a4945ca 100644 --- a/trunk/drivers/staging/altera-stapl/altera.c +++ b/trunk/drivers/staging/altera-stapl/altera.c @@ -2384,7 +2384,7 @@ static int altera_get_act_info(u8 *p, act_proc_attribute = (p[proc_table + (13 * act_proc_id) + 8] & 0x03); - procptr = (struct altera_procinfo *) + procptr = kzalloc(sizeof(struct altera_procinfo), GFP_KERNEL);