131ae388b8
In dvb_usb_i2c_init, if i2c_add_adapter fails, it only prints an error
message, and then continues to set DVB_USB_STATE_I2C. This affects the
logic of dvb_usb_i2c_exit, which leads to that, the deletion of i2c_adap
even if the i2c_add_adapter fails.
Fix this by returning at the failure of i2c_add_adapter and then move
dvb_usb_i2c_exit out of the error handling code of dvb_usb_i2c_init.
Fixes: 13a79f14ab ("media: dvb-usb: Fix memory leak at error in dvb_usb_device_init()")
Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
50 lines
1.1 KiB
C
50 lines
1.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/* dvb-usb-i2c.c is part of the DVB USB library.
|
|
*
|
|
* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
|
|
* see dvb-usb-init.c for copyright information.
|
|
*
|
|
* This file contains functions for (de-)initializing an I2C adapter.
|
|
*/
|
|
#include "dvb-usb-common.h"
|
|
|
|
int dvb_usb_i2c_init(struct dvb_usb_device *d)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (!(d->props.caps & DVB_USB_IS_AN_I2C_ADAPTER))
|
|
return 0;
|
|
|
|
if (d->props.i2c_algo == NULL) {
|
|
err("no i2c algorithm specified");
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
strscpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
|
|
d->i2c_adap.algo = d->props.i2c_algo;
|
|
d->i2c_adap.algo_data = NULL;
|
|
d->i2c_adap.dev.parent = &d->udev->dev;
|
|
|
|
i2c_set_adapdata(&d->i2c_adap, d);
|
|
|
|
ret = i2c_add_adapter(&d->i2c_adap);
|
|
if (ret < 0) {
|
|
err("could not add i2c adapter");
|
|
goto err;
|
|
}
|
|
|
|
d->state |= DVB_USB_STATE_I2C;
|
|
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
int dvb_usb_i2c_exit(struct dvb_usb_device *d)
|
|
{
|
|
if (d->state & DVB_USB_STATE_I2C)
|
|
i2c_del_adapter(&d->i2c_adap);
|
|
d->state &= ~DVB_USB_STATE_I2C;
|
|
return 0;
|
|
}
|