evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V4L/DVB: gspca - main: Fix a compile error when CONFIG_INPUT is not set

Browse source 
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>
This commit is contained in:
Jean-François Moine 2010-02-18 15:02:51 -03:00 • committed by Mauro Carvalho Chehab
parent 1e5eb1133a
commit e070bf9ef8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/video/gspca/gspca.c
View file

@ -40,8 +40,10 @@
#include "gspca.h" #include "gspca.h"
#ifdef CONFIG_INPUT
#include <linux/input.h> #include <linux/input.h>
#include <linux/usb/input.h> #include <linux/usb/input.h>
#endif
/* global values */ /* global values */
#define DEF_NURBS 3 /* default number of URBs */ #define DEF_NURBS 3 /* default number of URBs */
@ -2329,7 +2331,9 @@ EXPORT_SYMBOL(gspca_dev_probe);
void gspca_disconnect(struct usb_interface *intf) void gspca_disconnect(struct usb_interface *intf)
{ {
struct gspca_dev *gspca_dev = usb_get_intfdata(intf); struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
#ifdef CONFIG_INPUT
struct input_dev *input_dev; struct input_dev *input_dev;
#endif
PDEBUG(D_PROBE, "%s disconnect", PDEBUG(D_PROBE, "%s disconnect",
video_device_node_name(&gspca_dev->vdev)); video_device_node_name(&gspca_dev->vdev));
@ -2341,12 +2345,14 @@ void gspca_disconnect(struct usb_interface *intf)
wake_up_interruptible(&gspca_dev->wq); wake_up_interruptible(&gspca_dev->wq);
} }
#ifdef CONFIG_INPUT
gspca_input_destroy_urb(gspca_dev); gspca_input_destroy_urb(gspca_dev);
input_dev = gspca_dev->input_dev; input_dev = gspca_dev->input_dev;
if (input_dev) { if (input_dev) {
gspca_dev->input_dev = NULL; gspca_dev->input_dev = NULL;
input_unregister_device(input_dev); input_unregister_device(input_dev);
} }
#endif
/* the device is freed at exit of this function */ /* the device is freed at exit of this function */
gspca_dev->dev = NULL; gspca_dev->dev = NULL;