diff options
| author |   Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-01-27 13:52:52 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-02-08 21:00:48 +0100 |
| commit | 88e7bf2a4c35d1200c2f72f5cd3d9e72c7f6c890 (patch) | |
| tree | 9d91a89b20d668c49f774e73da74d2a1ec5aad1b /drivers/ieee1394 | |
| parent | ieee1394: sbp2: lower block queue alignment requirement (diff) | |
| download | linux-dev-88e7bf2a4c35d1200c2f72f5cd3d9e72c7f6c890.tar.xz linux-dev-88e7bf2a4c35d1200c2f72f5cd3d9e72c7f6c890.zip | |
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
I did not test card ejection with open /dev/dv1394 files yet.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 1084da4d88a9..d636cfad7fcf 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c @@ -2267,11 +2267,7 @@ static void dv1394_remove_host (struct hpsb_host *host) { struct video_card *video; 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 { @@ -2284,6 +2280,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; } } @@ -2293,8 +2290,9 @@ static void dv1394_remove_host (struct hpsb_host *host) dv1394_un_init(video); } while (video != NULL); - class_device_destroy(hpsb_protocol_class, - MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); + if (found_ohci_card) + class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR, + IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2))); } static void dv1394_add_host (struct hpsb_host *host) |