[PATCH] i2c: make i2c_unregister_device() ERR_PTR safe

[PATCH] i2c: make i2c_unregister_device() ERR_PTR safe

[Wolfram Sang]

We are moving towards returning ERR_PTRs when i2c_new_*_device() calls
fail. Make sure its counterpart for unregistering handles ERR_PTRs as
well.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/i2c/i2c-core-base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 76cb91e064b8..e5ba612ddc1e 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -832,7 +832,7 @@ EXPORT_SYMBOL_GPL(i2c_new_device);
  */
 void i2c_unregister_device(struct i2c_client *client)
 {
-	if (!client)
+	if (IS_ERR_OR_NULL(client))
 		return;
 
 	if (client->dev.of_node) {
-- 
2.20.1

Re: [PATCH] i2c: make i2c_unregister_device() ERR_PTR safe

[Geert Uytterhoeven]

On Mon, Aug 19, 2019 at 10:49 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> We are moving towards returning ERR_PTRs when i2c_new_*_device() calls
> fail. Make sure its counterpart for unregistering handles ERR_PTRs as
> well.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] i2c: make i2c_unregister_device() ERR_PTR safe

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

On Mon, Aug 19, 2019 at 10:48:25PM +0200, Wolfram Sang wrote:
> We are moving towards returning ERR_PTRs when i2c_new_*_device() calls
> fail. Make sure its counterpart for unregistering handles ERR_PTRs as
> well.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]