git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HID: hiddev, fix lock imbalance
[safe/jmp/linux-2.6]
/
drivers
/
hid
/
hid-gaff.c
diff --git
a/drivers/hid/hid-gaff.c
b/drivers/hid/hid-gaff.c
index
510ad3a
..
8a11ccd
100644
(file)
--- a/
drivers/hid/hid-gaff.c
+++ b/
drivers/hid/hid-gaff.c
@@
-31,6
+31,8
@@
#include <linux/usb.h>
#include <linux/hid.h>
#include "hid-ids.h"
#include <linux/usb.h>
#include <linux/hid.h>
#include "hid-ids.h"
+
+#ifdef CONFIG_GREENASIA_FF
#include "usbhid/usbhid.h"
struct gaff_device {
#include "usbhid/usbhid.h"
struct gaff_device {
@@
-130,6
+132,12
@@
static int gaff_init(struct hid_device *hid)
return 0;
}
return 0;
}
+#else
+static inline int gaff_init(struct hid_device *hdev)
+{
+ return 0;
+}
+#endif
static int ga_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
static int ga_probe(struct hid_device *hdev, const struct hid_device_id *id)
{