|
@@ -1520,10 +1520,8 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg)
|
|
|
MXT_INFO_CHECKSUM_SIZE;
|
|
|
config_mem_size = data->mem_size - cfg_start_ofs;
|
|
|
config_mem = kzalloc(config_mem_size, GFP_KERNEL);
|
|
|
- if (!config_mem) {
|
|
|
- dev_err(dev, "Failed to allocate memory\n");
|
|
|
+ if (!config_mem)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
ret = mxt_prepare_cfg_mem(data, cfg, data_pos, cfg_start_ofs,
|
|
|
config_mem, config_mem_size);
|
|
@@ -1982,10 +1980,8 @@ static int mxt_initialize_input_device(struct mxt_data *data)
|
|
|
|
|
|
/* Register input device */
|
|
|
input_dev = input_allocate_device();
|
|
|
- if (!input_dev) {
|
|
|
- dev_err(dev, "Failed to allocate memory\n");
|
|
|
+ if (!input_dev)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
input_dev->name = "Atmel maXTouch Touchscreen";
|
|
|
input_dev->phys = data->phys;
|