summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-12-16 12:49:23 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-01-17 10:57:48 +0200
commit0ede5804ca3b42c831f7440ec29bc7187e5376bb (patch)
tree6760c9fd0cda38527f4d237d2e5125befff5e25a /drivers/video
parent6fc19c40be96df73d81d8123e31fe45c16c6c2b6 (diff)
downloadlinux-stable-0ede5804ca3b42c831f7440ec29bc7187e5376bb.tar.gz
linux-stable-0ede5804ca3b42c831f7440ec29bc7187e5376bb.tar.bz2
linux-stable-0ede5804ca3b42c831f7440ec29bc7187e5376bb.zip
tgafb: potential NULL dereference in init
Static checkers complain that there are paths where "tga_type_name" can be NULL. I've re-arranged the code slightly so that's impossible. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tgafb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 5e94c6e4f682..07c7df9ee77b 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -1490,10 +1490,9 @@ tgafb_init_fix(struct fb_info *info)
if (tga_bus_tc)
tga_type_name = "Digital ZLX-E3";
break;
- default:
- tga_type_name = "Unknown";
- break;
}
+ if (!tga_type_name)
+ tga_type_name = "Unknown";
strlcpy(info->fix.id, tga_type_name, sizeof(info->fix.id));