mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-13 12:59:33 -04:00
media: ov08x40: Improve ov08x40_identify_module() error logging
ov08x40_identify_module() already logs an error if the read ID mismatches, so having its caller also log an error results in 2 errors in this case. Add error logging to the ID register read in ov08x40_identify_module() and drop the error logging in the caller. Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
committed by
Hans Verkuil
parent
7a39639e44
commit
24d74ca502
@@ -1943,8 +1943,10 @@ static int ov08x40_identify_module(struct ov08x40 *ov08x)
|
||||
|
||||
ret = ov08x40_read_reg(ov08x, OV08X40_REG_CHIP_ID,
|
||||
OV08X40_REG_VALUE_24BIT, &val);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
dev_err(&client->dev, "error reading chip-id register: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (val != OV08X40_CHIP_ID) {
|
||||
dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
|
||||
@@ -2262,10 +2264,8 @@ static int ov08x40_probe(struct i2c_client *client)
|
||||
|
||||
/* Check module identity */
|
||||
ret = ov08x40_identify_module(ov08x);
|
||||
if (ret) {
|
||||
dev_err(&client->dev, "failed to find sensor: %d\n", ret);
|
||||
if (ret)
|
||||
goto probe_power_off;
|
||||
}
|
||||
}
|
||||
|
||||
/* Set default mode to max resolution */
|
||||
|
||||
Reference in New Issue
Block a user