static int
intelfb_set_par(struct fb_info *info)
{
- struct intelfb_hwstate hw;
-
+ struct intelfb_hwstate *hw;
struct intelfb_info *dinfo = GET_DINFO(info);
if (FIXED_MODE(dinfo)) {
return -EINVAL;
}
+ hw = kmalloc(sizeof(*hw), GFP_ATOMIC);
+ if (!hw)
+ return -ENOMEM;
+
DBG_MSG("intelfb_set_par (%dx%d-%d)\n", info->var.xres,
info->var.yres, info->var.bits_per_pixel);
if (dinfo->accel)
intelfbhw_2d_stop(dinfo);
- hw = dinfo->save_state;
- if (intelfbhw_mode_to_hw(dinfo, &hw, &info->var))
- return -EINVAL;
- if (intelfbhw_program_mode(dinfo, &hw, 0))
- return -EINVAL;
+ memcpy(hw, &dinfo->save_state, sizeof(*hw));
+ if (intelfbhw_mode_to_hw(dinfo, hw, &info->var))
+ goto invalid_mode;
+ if (intelfbhw_program_mode(dinfo, hw, 0))
+ goto invalid_mode;
#if REGDUMP > 0
- intelfbhw_read_hw_state(dinfo, &hw, 0);
- intelfbhw_print_hw_state(dinfo, &hw);
+ intelfbhw_read_hw_state(dinfo, hw, 0);
+ intelfbhw_print_hw_state(dinfo, hw);
#endif
update_dinfo(dinfo, &info->var);
} else {
info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
}
+ kfree(hw);
return 0;
+invalid_mode:
+ kfree(hw);
+ return -EINVAL;
}
static int