Fix a possible null pointer dereference, there is otherwise a risk of a 
possible null pointer dereference

This was found using a static code analysis program called cppcheck

Signed-off-by: Rickard Strandqvist <[email protected]>
---
 drivers/video/fbdev/matrox/matroxfb_base.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c 
b/drivers/video/fbdev/matrox/matroxfb_base.c
index 7116c53..85ef84b 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -1971,9 +1971,9 @@ static void matroxfb_register_device(struct 
matrox_fb_info* minfo) {
        int i = 0;
        list_add(&minfo->next_fb, &matroxfb_list);
        for (drv = matroxfb_driver_l(matroxfb_driver_list.next);
-            drv != matroxfb_driver_l(&matroxfb_driver_list);
+            drv && drv != matroxfb_driver_l(&matroxfb_driver_list);
             drv = matroxfb_driver_l(drv->node.next)) {
-               if (drv && drv->probe) {
+               if (drv->probe) {
                        void *p = drv->probe(minfo);
                        if (p) {
                                minfo->drivers_data[i] = p;
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to