| Message ID | 20200407093052.GL68494@mwanda (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86: surface3_power: Fix a NULL vs IS_ERR() check in probe | expand |
On Tue, Apr 7, 2020 at 12:33 PM Dan Carpenter <dan.carpenter@oracle.com> wrote: > > The i2c_acpi_new_device() function never returns NULL, it returns error > pointers. > Pushed to my review and testing queue, thanks! > Fixes: b1f81b496b0d ("platform/x86: surface3_power: MSHW0011 rev-eng implementation") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/platform/x86/surface3_power.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/x86/surface3_power.c > index 946ac2dc08ae..cc4f9cba6856 100644 > --- a/drivers/platform/x86/surface3_power.c > +++ b/drivers/platform/x86/surface3_power.c > @@ -522,8 +522,8 @@ static int mshw0011_probe(struct i2c_client *client) > strlcpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE); > > bat0 = i2c_acpi_new_device(dev, 1, &board_info); > - if (!bat0) > - return -ENOMEM; > + if (IS_ERR(bat0)) > + return PTR_ERR(bat0); > > data->bat0 = bat0; > i2c_set_clientdata(bat0, data); > -- > 2.25.1 >
diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/x86/surface3_power.c index 946ac2dc08ae..cc4f9cba6856 100644 --- a/drivers/platform/x86/surface3_power.c +++ b/drivers/platform/x86/surface3_power.c @@ -522,8 +522,8 @@ static int mshw0011_probe(struct i2c_client *client) strlcpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE); bat0 = i2c_acpi_new_device(dev, 1, &board_info); - if (!bat0) - return -ENOMEM; + if (IS_ERR(bat0)) + return PTR_ERR(bat0); data->bat0 = bat0; i2c_set_clientdata(bat0, data);
The i2c_acpi_new_device() function never returns NULL, it returns error pointers. Fixes: b1f81b496b0d ("platform/x86: surface3_power: MSHW0011 rev-eng implementation") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/platform/x86/surface3_power.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)