aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYiannis Marangos <yiannis.marangos@gmail.com>2017-11-07 19:23:11 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-11-07 20:45:07 -0500
commit26dd633e437dca218547ccbeacc71fe8a620b6f6 (patch)
treed65c778b22a5a5fb5c94010fe8a4f7fad6d49991
parenteca253912f734927005500da7d646536064b3ed3 (diff)
Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3
Some Synaptics devices, such as LEN0073, use SMBUS version 3. Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com> Acked-by: Benjamin Tissoires <benjamion.tissoires@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/rmi4/rmi_smbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c
index 225025a0940c..b6ccf39c6a7b 100644
--- a/drivers/input/rmi4/rmi_smbus.c
+++ b/drivers/input/rmi4/rmi_smbus.c
@@ -312,7 +312,7 @@ static int rmi_smb_probe(struct i2c_client *client,
312 rmi_smb->xport.dev = &client->dev; 312 rmi_smb->xport.dev = &client->dev;
313 rmi_smb->xport.pdata = *pdata; 313 rmi_smb->xport.pdata = *pdata;
314 rmi_smb->xport.pdata.irq = client->irq; 314 rmi_smb->xport.pdata.irq = client->irq;
315 rmi_smb->xport.proto_name = "smb2"; 315 rmi_smb->xport.proto_name = "smb";
316 rmi_smb->xport.ops = &rmi_smb_ops; 316 rmi_smb->xport.ops = &rmi_smb_ops;
317 317
318 smbus_version = rmi_smb_get_version(rmi_smb); 318 smbus_version = rmi_smb_get_version(rmi_smb);
@@ -322,7 +322,7 @@ static int rmi_smb_probe(struct i2c_client *client,
322 rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d", 322 rmi_dbg(RMI_DEBUG_XPORT, &client->dev, "Smbus version is %d",
323 smbus_version); 323 smbus_version);
324 324
325 if (smbus_version != 2) { 325 if (smbus_version != 2 && smbus_version != 3) {
326 dev_err(&client->dev, "Unrecognized SMB version %d\n", 326 dev_err(&client->dev, "Unrecognized SMB version %d\n",
327 smbus_version); 327 smbus_version);
328 return -ENODEV; 328 return -ENODEV;