[media] staging: media: go7007: firmware protection Protection for unfirmware load

If no firmware was loaded (no exists,wrong or some error) then rmmod
fails with OOPS, so need some protection stuff.

Signed-off-by: Volokh Konstantin <volokh84@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index 5443e25086e9f33b00980d314a874863653c82f8..a6cad158947535f513cebbdfe7a0daf8787fd3f0 100644 (file)
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -1245,7 +1245,6 @@ static void go7007_usb_disconnect(struct usb_interface *intf)
        struct urb *vurb, *aurb;
        int i;
 
-       go->status = STATUS_SHUTDOWN;
        usb_kill_urb(usb->intr_urb);
 
        /* Free USB-related structs */
@@ -1269,6 +1268,7 @@ static void go7007_usb_disconnect(struct usb_interface *intf)
        kfree(go->hpi_context);
 
        go7007_remove(go);
+       go->status = STATUS_SHUTDOWN;
 }
 
 static struct usb_driver go7007_usb_driver = {

diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c
index 94899759229f33f0130b3e7bc9eee675f7cf8f18..39e6749353becaf2ad59b128e50a86806cd7adc0 100644 (file)
--- a/drivers/staging/media/go7007/go7007-v4l2.c
+++ b/drivers/staging/media/go7007/go7007-v4l2.c
@@ -1832,5 +1832,6 @@ void go7007_v4l2_remove(struct go7007 *go)
        mutex_unlock(&go->hw_lock);
        if (go->video_dev)
                video_unregister_device(go->video_dev);
-       v4l2_device_unregister(&go->v4l2_dev);
+       if (go->status != STATUS_SHUTDOWN)
+               v4l2_device_unregister(&go->v4l2_dev);
 }