Skip to content

Commit

Permalink
V4L/DVB: gspca - main: Fix a compile error when CONFIG_INPUT is not set
Browse files Browse the repository at this point in the history
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 1e5eb11 commit e070bf9
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@

#include "gspca.h"

#ifdef CONFIG_INPUT
#include <linux/input.h>
#include <linux/usb/input.h>
#endif

/* global values */
#define DEF_NURBS 3 /* default number of URBs */
Expand Down Expand Up @@ -2329,7 +2331,9 @@ EXPORT_SYMBOL(gspca_dev_probe);
void gspca_disconnect(struct usb_interface *intf)
{
struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
#ifdef CONFIG_INPUT
struct input_dev *input_dev;
#endif

PDEBUG(D_PROBE, "%s disconnect",
video_device_node_name(&gspca_dev->vdev));
Expand All @@ -2341,12 +2345,14 @@ void gspca_disconnect(struct usb_interface *intf)
wake_up_interruptible(&gspca_dev->wq);
}

#ifdef CONFIG_INPUT
gspca_input_destroy_urb(gspca_dev);
input_dev = gspca_dev->input_dev;
if (input_dev) {
gspca_dev->input_dev = NULL;
input_unregister_device(input_dev);
}
#endif

/* the device is freed at exit of this function */
gspca_dev->dev = NULL;
Expand Down

0 comments on commit e070bf9

Please sign in to comment.