Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb2496c3 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: st-nci: Disable irq when powering the device up 



Upon some conditions (timing, CLF errors, platform errors...), the
irq might be already active when powering the device.

Add irq_active variable as a guard to avoid kernel warning message

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent a9e062d0

drivers/nfc/st-nci/i2c.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -50,6 +50,8 @@ struct st_nci_i2c_phy { 
	struct i2c_client *i2c_dev;

	struct i2c_client *i2c_dev;

	struct llt_ndlc *ndlc;

	struct llt_ndlc *ndlc;





	bool irq_active;



	unsigned int gpio_reset;

	unsigned int gpio_reset;

	unsigned int irq_polarity;

	unsigned int irq_polarity;
@@ -72,8 +74,10 @@ static int st_nci_i2c_enable(void *phy_id) 
	gpio_set_value(phy->gpio_reset, 1);

	gpio_set_value(phy->gpio_reset, 1);

	usleep_range(80000, 85000);

	usleep_range(80000, 85000);





	if (phy->ndlc->powered == 0)

	if (phy->ndlc->powered == 0 && phy->irq_active == 0) {

		enable_irq(phy->i2c_dev->irq);

		enable_irq(phy->i2c_dev->irq);

		phy->irq_active = true;

	}





	return 0;

	return 0;

}

}
@@ -83,6 +87,7 @@ static void st_nci_i2c_disable(void *phy_id) 
	struct st_nci_i2c_phy *phy = phy_id;

	struct st_nci_i2c_phy *phy = phy_id;





	disable_irq_nosync(phy->i2c_dev->irq);

	disable_irq_nosync(phy->i2c_dev->irq);

	phy->irq_active = false;

}

}





/*

/*
@@ -342,6 +347,7 @@ static int st_nci_i2c_probe(struct i2c_client *client, 
		return r;

		return r;

	}

	}





	phy->irq_active = true;

	r = devm_request_threaded_irq(&client->dev, client->irq, NULL,

	r = devm_request_threaded_irq(&client->dev, client->irq, NULL,

				st_nci_irq_thread_fn,

				st_nci_irq_thread_fn,

				phy->irq_polarity | IRQF_ONESHOT,

				phy->irq_polarity | IRQF_ONESHOT,

drivers/nfc/st-nci/spi.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -51,6 +51,8 @@ struct st_nci_spi_phy { 
	struct spi_device *spi_dev;

	struct spi_device *spi_dev;

	struct llt_ndlc *ndlc;

	struct llt_ndlc *ndlc;





	bool irq_active;



	unsigned int gpio_reset;

	unsigned int gpio_reset;

	unsigned int irq_polarity;

	unsigned int irq_polarity;
@@ -73,8 +75,10 @@ static int st_nci_spi_enable(void *phy_id) 
	gpio_set_value(phy->gpio_reset, 1);

	gpio_set_value(phy->gpio_reset, 1);

	usleep_range(80000, 85000);

	usleep_range(80000, 85000);





	if (phy->ndlc->powered == 0)

	if (phy->ndlc->powered == 0 && phy->irq_active == 0) {

		enable_irq(phy->spi_dev->irq);

		enable_irq(phy->spi_dev->irq);

		phy->irq_active = true;

	}





	return 0;

	return 0;

}

}
@@ -84,6 +88,7 @@ static void st_nci_spi_disable(void *phy_id) 
	struct st_nci_spi_phy *phy = phy_id;

	struct st_nci_spi_phy *phy = phy_id;





	disable_irq_nosync(phy->spi_dev->irq);

	disable_irq_nosync(phy->spi_dev->irq);

	phy->irq_active = false;

}

}





/*

/*
@@ -358,6 +363,7 @@ static int st_nci_spi_probe(struct spi_device *dev) 
		return r;

		return r;

	}

	}





	phy->irq_active = true;

	r = devm_request_threaded_irq(&dev->dev, dev->irq, NULL,

	r = devm_request_threaded_irq(&dev->dev, dev->irq, NULL,

				st_nci_irq_thread_fn,

				st_nci_irq_thread_fn,

				phy->irq_polarity | IRQF_ONESHOT,

				phy->irq_polarity | IRQF_ONESHOT,