summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2018-03-28 16:34:28 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-03-28 16:34:28 +0200
commit2b797d332199eb4dc54019e686221661eff5e2c9 (patch)
tree891a55678ee5bf2e6e230d3a70f706c675239245 /drivers
parentc116568689d2ddddc878a8c55cd9e84d27b88e94 (diff)
downloadlinux-2b797d332199eb4dc54019e686221661eff5e2c9.tar.bz2
video: matroxfb: Delete an error message for a failed memory allocation in matroxfb_crtc2_probe()
Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/matrox/matroxfb_crtc2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbdev/matrox/matroxfb_crtc2.c b/drivers/video/fbdev/matrox/matroxfb_crtc2.c
index 02796a4317a9..f64e1d55d7a1 100644
--- a/drivers/video/fbdev/matrox/matroxfb_crtc2.c
+++ b/drivers/video/fbdev/matrox/matroxfb_crtc2.c
@@ -696,10 +696,9 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
if (!minfo->devflags.crtc2)
return NULL;
m2info = kzalloc(sizeof(*m2info), GFP_KERNEL);
- if (!m2info) {
- printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n");
+ if (!m2info)
return NULL;
- }
+
m2info->primary_dev = minfo;
if (matroxfb_dh_registerfb(m2info)) {
kfree(m2info);