Skip to contentSkip to conversation

scx200_acb: Fix return on init error

PATCH New Jean Delvare 1 participant 1 message Apr 26, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scx200_acb: Fix return on init error

Hi Greg,

This should go in 2.6.17.

Content-Disposition: inline; filename=i2c-scx200_acb-fix-return-on-init-error.patch

The scx200_acb driver shouldn't return failure after initialization if it successfully registered at least one i2c_adapter, else we are leaking resources. The driver was OK in that respect up to 2.6.16, a recent change broke it.

This is part of the fix to bug #6445.

Signed-off-by Jean Delvare <khali at linux-fr.org>
Cc Ben Gardner <bgardner at wabtec.com>
---
 drivers/i2c/busses/scx200_acb.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/i2c/busses/scx200_acb.c +3 -0
@@ -524,6 +524,9 @@
 	} else if (pci_dev_present(divil_pci))
 		rc = scx200_add_cs553x();
 
+	/* If at least one bus was created, init must succeed */
+	if (scx200_acb_list)
+		return 0;
 	return rc;
 }
 
Signature · 1 line
Jean Delvare