Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Adrian Bunk 2006-11-25 11:09:29 -08:00 committed by Linus Torvalds
parent d728b1e69f
commit 17ad78e59a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/rtc/rtc-rs5c372.c
View file

@ -126,13 +126,13 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim)
return -EIO; return -EIO;
} }
dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);
if (osc) if (osc)
*osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768; *osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768;
if (trim) if (trim) {
*trim = buf & RS5C372_TRIM_MASK; *trim = buf & RS5C372_TRIM_MASK;
dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);
}
return 0; return 0;
} }