From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Mon, 16 Dec 2019 15:51:40 +0000 (+0100)
Subject: media: usb: dvb-usb-v2: zd1301: convert to use i2c_new_client_device()
X-Git-Tag: v5.6-rc1~93^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dd0121269b238c13ae077a056113ee009affd18;p=thirdparty%2Fkernel%2Flinux.git

media: usb: dvb-usb-v2: zd1301: convert to use i2c_new_client_device()

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>
---

diff --git a/drivers/media/usb/dvb-usb-v2/zd1301.c b/drivers/media/usb/dvb-usb-v2/zd1301.c
index 63b66b207b64d..ba2c1b0d39898 100644
--- a/drivers/media/usb/dvb-usb-v2/zd1301.c
+++ b/drivers/media/usb/dvb-usb-v2/zd1301.c
@@ -172,8 +172,8 @@ static int zd1301_frontend_attach(struct dvb_usb_adapter *adap)
 	board_info.addr = 0x60;
 	board_info.platform_data = &dev->mt2060_pdata;
 	request_module("%s", "mt2060");
-	client = i2c_new_device(adapter, &board_info);
-	if (!client || !client->dev.driver) {
+	client = i2c_new_client_device(adapter, &board_info);
+	if (!i2c_client_has_driver(client)) {
 		ret = -ENODEV;
 		goto err_module_put_demod;
 	}