nfc: fdp: Move i2c client irq checking
It is cleaner to check if the i2c_client irq is not configured properly before allocating any data. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
397d6497bd
commit
0b0a264df5
|
@ -298,6 +298,12 @@ static int fdp_nci_i2c_probe(struct i2c_client *client,
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Checking if we have an irq */
|
||||||
|
if (client->irq <= 0) {
|
||||||
|
nfc_err(dev, "IRQ not present\n");
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy),
|
phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!phy)
|
if (!phy)
|
||||||
|
@ -307,12 +313,6 @@ static int fdp_nci_i2c_probe(struct i2c_client *client,
|
||||||
phy->next_read_size = FDP_NCI_I2C_MIN_PAYLOAD;
|
phy->next_read_size = FDP_NCI_I2C_MIN_PAYLOAD;
|
||||||
i2c_set_clientdata(client, phy);
|
i2c_set_clientdata(client, phy);
|
||||||
|
|
||||||
/* Checking if we have an irq */
|
|
||||||
if (client->irq <= 0) {
|
|
||||||
dev_err(dev, "IRQ not present\n");
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
r = request_threaded_irq(client->irq, NULL, fdp_nci_i2c_irq_thread_fn,
|
r = request_threaded_irq(client->irq, NULL, fdp_nci_i2c_irq_thread_fn,
|
||||||
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
|
IRQF_TRIGGER_RISING | IRQF_ONESHOT,
|
||||||
FDP_I2C_DRIVER_NAME, phy);
|
FDP_I2C_DRIVER_NAME, phy);
|
||||||
|
|
Loading…
Reference in New Issue