Commit 17ad78e5 authored Nov 25, 2006 by Adrian Bunk Committed by Linus Torvalds Nov 25, 2006

[PATCH] drivers/rtc/rtc-rs5c372.c: fix a NULL dereference



The correct order is: NULL check before dereference

This was a guaranteed NULL dereference with debugging enabled since
rs5c372_sysfs_show_osc() does actually pass NULL...

Spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent d728b1e6

drivers/rtc/rtc-rs5c372.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -126,13 +126,13 @@ static int rs5c372_get_trim(struct i2c_client client, int osc, int *trim)
		return -EIO;
		}

		dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);

		if (osc)
		*osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768;

		if (trim)
		if (trim) {
		*trim = buf & RS5C372_TRIM_MASK;
		dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);
		}

		return 0;
		}