| Message ID | 20191011185055.GA20972@mwanda (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c8dd192be821039d7023e0a5869d2cdf3acdef7e |
| Headers | show |
| Series | [v2] usb: typec: fix an IS_ERR() vs NULL bug in hd3ss3220_probe() | expand |
On Fri, Oct 11, 2019 at 09:50:55PM +0300, Dan Carpenter wrote: > The device_get_named_child_node() function doesn't return error > pointers, it returns NULL on error. > > Fixes: 1c48c759ef4b ("usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > v2: remove -ENODEV instead of -EIO > > drivers/usb/typec/hd3ss3220.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c > index 9715600aeb04..8afaf5768a17 100644 > --- a/drivers/usb/typec/hd3ss3220.c > +++ b/drivers/usb/typec/hd3ss3220.c > @@ -172,8 +172,8 @@ static int hd3ss3220_probe(struct i2c_client *client, > hd3ss3220_set_source_pref(hd3ss3220, > HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT); > connector = device_get_named_child_node(hd3ss3220->dev, "connector"); > - if (IS_ERR(connector)) > - return PTR_ERR(connector); > + if (!connector) > + return -ENODEV; > > hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector); > fwnode_handle_put(connector); > -- > 2.20.1 thanks,
diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c index 9715600aeb04..8afaf5768a17 100644 --- a/drivers/usb/typec/hd3ss3220.c +++ b/drivers/usb/typec/hd3ss3220.c @@ -172,8 +172,8 @@ static int hd3ss3220_probe(struct i2c_client *client, hd3ss3220_set_source_pref(hd3ss3220, HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT); connector = device_get_named_child_node(hd3ss3220->dev, "connector"); - if (IS_ERR(connector)) - return PTR_ERR(connector); + if (!connector) + return -ENODEV; hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector); fwnode_handle_put(connector);
The device_get_named_child_node() function doesn't return error pointers, it returns NULL on error. Fixes: 1c48c759ef4b ("usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: remove -ENODEV instead of -EIO drivers/usb/typec/hd3ss3220.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)