Skip to content

Commit

Permalink
media: usb: dvb-usb: dib0700_devices: convert to use i2c_new_client_d…
Browse files Browse the repository at this point in the history
…evice()

Use the newer API returning an ERRPTR and use the new helper to bail
out.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  • Loading branch information
Wolfram Sang authored and Mauro Carvalho Chehab committed Jan 9, 2020
1 parent 3dd0121 commit 6e040e6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/usb/dvb-usb/dib0700_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -3772,8 +3772,8 @@ static int xbox_one_attach(struct dvb_usb_adapter *adap)
info.addr = 0x18;
info.platform_data = &mn88472_config;
request_module(info.type);
client_demod = i2c_new_device(&d->i2c_adap, &info);
if (client_demod == NULL || client_demod->dev.driver == NULL)
client_demod = i2c_new_client_device(&d->i2c_adap, &info);
if (!i2c_client_has_driver(client_demod))
goto fail_demod_device;
if (!try_module_get(client_demod->dev.driver->owner))
goto fail_demod_module;
Expand All @@ -3800,8 +3800,8 @@ static int xbox_one_attach(struct dvb_usb_adapter *adap)
info.platform_data = &tda18250_config;

request_module(info.type);
client_tuner = i2c_new_device(&adap->dev->i2c_adap, &info);
if (client_tuner == NULL || client_tuner->dev.driver == NULL)
client_tuner = i2c_new_client_device(&adap->dev->i2c_adap, &info);
if (!i2c_client_has_driver(client_tuner))
goto fail_tuner_device;
if (!try_module_get(client_tuner->dev.driver->owner))
goto fail_tuner_module;
Expand Down

0 comments on commit 6e040e6

Please sign in to comment.