From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Sun, 5 Jan 2014 11:43:40 +0000 (-0300)
Subject: [media] em28xx: unregister i2c bus 0 if bus 1 fails to register
X-Git-Tag: v3.14-rc1~20^2~188
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1f0ee65a3b6a3c78c4f6b10f8df5700a44ed3c36;p=~emulex%2Finfiniband.git

[media] em28xx: unregister i2c bus 0 if bus 1 fails to register

Fix the error handling logic, making it to unregister i2c bus 0, in
case of a failure to register the second bus.

Reported-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 541de6df127..dbce4dc421f 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2989,6 +2989,9 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
 		if (retval < 0) {
 			em28xx_errdev("%s: em28xx_i2c_register bus 1 - error [%d]!\n",
 				__func__, retval);
+
+			em28xx_i2c_unregister(dev, 0);
+
 			return retval;
 		}
 	}