summaryrefslogtreecommitdiff
path: root/drivers/staging/typec
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2017-08-30 11:48:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-31 18:23:12 +0200
commit4660e4aeb9d74895eb6478932bf5cabeb0db723e (patch)
treef065792a0eb572f5364023483513c16bf8635ce8 /drivers/staging/typec
parent097578ec200858cfa2dd905b08ab8d5576a656e6 (diff)
staging: typec: fusb302: Use client->irq as irq if set
The fusb302 is also used on x86 systems where the platform code sets the irq in client->irq and there is no gpio named fcs,int_n. Cc: "Yueyao (Nathan) Zhu" <yueyao@google.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/typec')
-rw-r--r--drivers/staging/typec/fusb302/fusb302.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/typec/fusb302/fusb302.c b/drivers/staging/typec/fusb302/fusb302.c
index 1c1751c994db..675161cf4f3a 100644
--- a/drivers/staging/typec/fusb302/fusb302.c
+++ b/drivers/staging/typec/fusb302/fusb302.c
@@ -1735,9 +1735,13 @@ static int fusb302_probe(struct i2c_client *client,
goto destroy_workqueue;
}
- ret = init_gpio(chip);
- if (ret < 0)
- goto destroy_workqueue;
+ if (client->irq) {
+ chip->gpio_int_n_irq = client->irq;
+ } else {
+ ret = init_gpio(chip);
+ if (ret < 0)
+ goto destroy_workqueue;
+ }
chip->tcpm_port = tcpm_register_port(&client->dev, &chip->tcpc_dev);
if (IS_ERR(chip->tcpm_port)) {