Skip to content

Commit 599fb2a

Browse files
committed
Merge branch 'for-6.1/amd_sfh' into for-linus
- reduce verbosity of amd_sfh driver (Basavaraj Natikar) - better handling of devices with SFH1.1 (Basavaraj Natikar)
2 parents b320467 + 68266bd commit 599fb2a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata)
110110
amd_sfh1_1_set_desc_ops(mp2_ops);
111111

112112
cl_data->num_hid_devices = amd_sfh_get_sensor_num(privdata, &cl_data->sensor_idx[0]);
113+
if (cl_data->num_hid_devices == 0)
114+
return -ENODEV;
113115

114116
INIT_DELAYED_WORK(&cl_data->work, amd_sfh_work);
115117
INIT_DELAYED_WORK(&cl_data->work_buffer, amd_sfh_work_buffer);
@@ -286,13 +288,13 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2)
286288

287289
phy_base <<= 21;
288290
if (!devm_request_mem_region(dev, phy_base, 128 * 1024, "amd_sfh")) {
289-
dev_err(dev, "can't reserve mmio registers\n");
291+
dev_dbg(dev, "can't reserve mmio registers\n");
290292
return -ENOMEM;
291293
}
292294

293295
mp2->vsbase = devm_ioremap(dev, phy_base, 128 * 1024);
294296
if (!mp2->vsbase) {
295-
dev_err(dev, "failed to remap vsbase\n");
297+
dev_dbg(dev, "failed to remap vsbase\n");
296298
return -ENOMEM;
297299
}
298300

@@ -301,7 +303,7 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2)
301303

302304
memcpy_fromio(&binfo, mp2->vsbase, sizeof(struct sfh_base_info));
303305
if (binfo.sbase.fw_info.fw_ver == 0 || binfo.sbase.s_list.sl.sensors == 0) {
304-
dev_err(dev, "failed to get sensors\n");
306+
dev_dbg(dev, "failed to get sensors\n");
305307
return -EOPNOTSUPP;
306308
}
307309
dev_dbg(dev, "firmware version 0x%x\n", binfo.sbase.fw_info.fw_ver);

0 commit comments

Comments
 (0)