diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/matrox/i2c-matroxfb.c | 4 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c index fe28848e7b52..f64c4a0984cd 100644 --- a/drivers/video/matrox/i2c-matroxfb.c +++ b/drivers/video/matrox/i2c-matroxfb.c | |||
@@ -146,7 +146,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { | |||
146 | unsigned long flags; | 146 | unsigned long flags; |
147 | struct matroxfb_dh_maven_info* m2info; | 147 | struct matroxfb_dh_maven_info* m2info; |
148 | 148 | ||
149 | m2info = kmalloc(sizeof(*m2info), GFP_KERNEL); | 149 | m2info = kzalloc(sizeof(*m2info), GFP_KERNEL); |
150 | if (!m2info) | 150 | if (!m2info) |
151 | return NULL; | 151 | return NULL; |
152 | 152 | ||
@@ -155,8 +155,6 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) { | |||
155 | matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00); | 155 | matroxfb_DAC_out(PMINFO DAC_XGENIOCTRL, 0x00); |
156 | matroxfb_DAC_unlock_irqrestore(flags); | 156 | matroxfb_DAC_unlock_irqrestore(flags); |
157 | 157 | ||
158 | memset(m2info, 0, sizeof(*m2info)); | ||
159 | |||
160 | switch (ACCESS_FBINFO(chip)) { | 158 | switch (ACCESS_FBINFO(chip)) { |
161 | case MGA_2064: | 159 | case MGA_2064: |
162 | case MGA_2164: | 160 | case MGA_2164: |
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 2c9801090fae..03ae55b168ff 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
@@ -694,12 +694,11 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) { | |||
694 | /* hardware is CRTC2 incapable... */ | 694 | /* hardware is CRTC2 incapable... */ |
695 | if (!ACCESS_FBINFO(devflags.crtc2)) | 695 | if (!ACCESS_FBINFO(devflags.crtc2)) |
696 | return NULL; | 696 | return NULL; |
697 | m2info = kmalloc(sizeof(*m2info), GFP_KERNEL); | 697 | m2info = kzalloc(sizeof(*m2info), GFP_KERNEL); |
698 | if (!m2info) { | 698 | if (!m2info) { |
699 | printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n"); | 699 | printk(KERN_ERR "matroxfb_crtc2: Not enough memory for CRTC2 control structs\n"); |
700 | return NULL; | 700 | return NULL; |
701 | } | 701 | } |
702 | memset(m2info, 0, sizeof(*m2info)); | ||
703 | m2info->primary_dev = MINFO; | 702 | m2info->primary_dev = MINFO; |
704 | if (matroxfb_dh_registerfb(m2info)) { | 703 | if (matroxfb_dh_registerfb(m2info)) { |
705 | kfree(m2info); | 704 | kfree(m2info); |