ieee1394: dv1394: fix CardBus card ejection

Fix NULL pointer dereference on hot ejection of a FireWire card while
dv1394 was loaded.  http://bugzilla.kernel.org/show_bug.cgi?id=7121

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index efeaa944bd0a9ba3bd8e413f1f9fca6e569a39b2..9e1a12c59cadab0677125522d4b57ecbb6ce75db 100644 (file)
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2303,18 +2303,11 @@ static void dv1394_un_init(struct video_card *video)
 
 static void dv1394_remove_host (struct hpsb_host *host)
 {
-       struct video_card *video;
+       struct video_card *video, *tmp_vid;
        unsigned long flags;
-       int id = host->id;
-
-       /* We only work with the OHCI-1394 driver */
-       if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME))
-               return;
+       int id = host->id, found_ohci_card = 0;
 
-       /* find the corresponding video_cards */
        do {
-               struct video_card *tmp_vid;
-
                video = NULL;
 
                spin_lock_irqsave(&dv1394_cards_lock, flags);
@@ -2322,6 +2315,7 @@ static void dv1394_remove_host (struct hpsb_host *host)
                        if ((tmp_vid->id >> 2) == id) {
                                list_del(&tmp_vid->list);
                                video = tmp_vid;
+                               found_ohci_card = 1;
                                break;
                        }
                }
@@ -2329,7 +2323,10 @@ static void dv1394_remove_host (struct hpsb_host *host)
 
                if (video)
                        dv1394_un_init(video);
-       } while (video != NULL);
+       } while (video);
+
+       if (!found_ohci_card)
+               return;
 
        class_device_destroy(hpsb_protocol_class,
                MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));