---

yaml --- r: 181759 b: refs/heads/master c: ac82f59 h: refs/heads/master i: 181757: 1ff16b0 181755: 8d4730f 181751: 1678108 181743: eeb9605 181727: 56935ab 181695: c3bfbcd 181631: f5c6fd6 181503: 0b9295f 181247: ea02f4f v: v3
git-mirror · Feb 26, 2010 · f6c24e1 · f6c24e1
1 parent 3a44bb6
commit f6c24e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fb2dde28122e74bbab9dae3cc04bcbc8c08b332
+refs/heads/master: ac82f59f9cc6aae3300430fcc3422e59f83d89ae
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
@@ -158,7 +158,7 @@ static int gspca_input_connect(struct gspca_dev *dev)
 	int err = 0;
 
 	dev->input_dev = NULL;
-	if (dev->sd_desc->int_pkt_scan)  {
+	if (dev->sd_desc->int_pkt_scan || dev->sd_desc->other_input)  {
 		input_dev = input_allocate_device();
 		if (!input_dev)
 			return -ENOMEM;

diff --git a/trunk/drivers/media/video/gspca/gspca.h b/trunk/drivers/media/video/gspca/gspca.h
@@ -131,6 +131,9 @@ struct sd_desc {
 	cam_ident_op get_chip_ident;
 #ifdef CONFIG_INPUT
 	cam_int_pkt_op int_pkt_scan;
+	/* other_input makes the gspca core create gspca_dev->input even when
+	   int_pkt_scan is NULL, for cams with non interrupt driven buttons */
+	u8 other_input;
 #endif
 };