Commit 0990528b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:

 - omap: fix irq ACKS to avoid irq storming and system hang

 - ali1535, ali15x3, sis630: fix error path at probe exit

* tag 'i2c-for-6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: sis630: Fix an error handling path in sis630_probe()
  i2c: ali15x3: Fix an error handling path in ali15x3_probe()
  i2c: ali1535: Fix an error handling path in ali1535_probe()
  i2c: omap: fix IRQ storms
parents ad87a8d0 3ef18b23

drivers/i2c/busses/i2c-ali1535.c

+11 −1
Original line number Diff line number Diff line
@@ -485,6 +485,8 @@ MODULE_DEVICE_TABLE(pci, ali1535_ids); 


static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	int ret;



	if (ali1535_setup(dev)) {

		dev_warn(&dev->dev,

			"ALI1535 not detected, module not inserted.\n");
@@ -496,7 +498,15 @@ static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id) 


	snprintf(ali1535_adapter.name, sizeof(ali1535_adapter.name),

		"SMBus ALI1535 adapter at %04x", ali1535_offset);

	return i2c_add_adapter(&ali1535_adapter);

	ret = i2c_add_adapter(&ali1535_adapter);

	if (ret)

		goto release_region;



	return 0;



release_region:

	release_region(ali1535_smba, ALI1535_SMB_IOSIZE);

	return ret;

}



static void ali1535_remove(struct pci_dev *dev)

drivers/i2c/busses/i2c-ali15x3.c

+11 −1
Original line number Diff line number Diff line
@@ -472,6 +472,8 @@ MODULE_DEVICE_TABLE (pci, ali15x3_ids); 


static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	int ret;



	if (ali15x3_setup(dev)) {

		dev_err(&dev->dev,

			"ALI15X3 not detected, module not inserted.\n");
@@ -483,7 +485,15 @@ static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id) 


	snprintf(ali15x3_adapter.name, sizeof(ali15x3_adapter.name),

		"SMBus ALI15X3 adapter at %04x", ali15x3_smba);

	return i2c_add_adapter(&ali15x3_adapter);

	ret = i2c_add_adapter(&ali15x3_adapter);

	if (ret)

		goto release_region;



	return 0;



release_region:

	release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE);

	return ret;

}



static void ali15x3_remove(struct pci_dev *dev)

drivers/i2c/busses/i2c-omap.c

+7 −19
Original line number Diff line number Diff line
@@ -1048,23 +1048,6 @@ static int omap_i2c_transmit_data(struct omap_i2c_dev *omap, u8 num_bytes, 
	return 0;

}



static irqreturn_t

omap_i2c_isr(int irq, void *dev_id)

{

	struct omap_i2c_dev *omap = dev_id;

	irqreturn_t ret = IRQ_HANDLED;

	u16 mask;

	u16 stat;



	stat = omap_i2c_read_reg(omap, OMAP_I2C_STAT_REG);

	mask = omap_i2c_read_reg(omap, OMAP_I2C_IE_REG) & ~OMAP_I2C_STAT_NACK;



	if (stat & mask)

		ret = IRQ_WAKE_THREAD;



	return ret;

}



static int omap_i2c_xfer_data(struct omap_i2c_dev *omap)

{

	u16 bits;
@@ -1095,8 +1078,13 @@ static int omap_i2c_xfer_data(struct omap_i2c_dev *omap) 
		}



		if (stat & OMAP_I2C_STAT_NACK) {

			err |= OMAP_I2C_STAT_NACK;

			omap->cmd_err |= OMAP_I2C_STAT_NACK;

			omap_i2c_ack_stat(omap, OMAP_I2C_STAT_NACK);



			if (!(stat & ~OMAP_I2C_STAT_NACK)) {

				err = -EAGAIN;

				break;

			}

		}



		if (stat & OMAP_I2C_STAT_AL) {
@@ -1472,7 +1460,7 @@ omap_i2c_probe(struct platform_device *pdev) 
				IRQF_NO_SUSPEND, pdev->name, omap);

	else

		r = devm_request_threaded_irq(&pdev->dev, omap->irq,

				omap_i2c_isr, omap_i2c_isr_thread,

				NULL, omap_i2c_isr_thread,

				IRQF_NO_SUSPEND | IRQF_ONESHOT,

				pdev->name, omap);

drivers/i2c/busses/i2c-sis630.c

+11 −1
Original line number Diff line number Diff line
@@ -509,6 +509,8 @@ MODULE_DEVICE_TABLE(pci, sis630_ids); 


static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	int ret;



	if (sis630_setup(dev)) {

		dev_err(&dev->dev,

			"SIS630 compatible bus not detected, "
@@ -522,7 +524,15 @@ static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	snprintf(sis630_adapter.name, sizeof(sis630_adapter.name),

		 "SMBus SIS630 adapter at %04x", smbus_base + SMB_STS);



	return i2c_add_adapter(&sis630_adapter);

	ret = i2c_add_adapter(&sis630_adapter);

	if (ret)

		goto release_region;



	return 0;



release_region:

	release_region(smbus_base + SMB_STS, SIS630_SMB_IOREGION);

	return ret;

}



static void sis630_remove(struct pci_dev *dev)