diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /drivers/usb/input/pid.c | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/usb/input/pid.c')
| -rw-r--r-- | drivers/usb/input/pid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c index a00672c96644..dca5ee93a4ef 100644 --- a/drivers/usb/input/pid.c +++ b/drivers/usb/input/pid.c | |||
| @@ -198,7 +198,7 @@ static int hid_pid_upload_effect(struct input_dev *dev, | |||
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | effect->id = id; | 200 | effect->id = id; |
| 201 | dev_dbg(&pid_private->hid->dev->dev, "effect ID is %d\n.", id); | 201 | dev_dbg(&pid_private->hid->dev->dev, "effect ID is %d.\n", id); |
| 202 | pid_private->effects[id].owner = current->pid; | 202 | pid_private->effects[id].owner = current->pid; |
| 203 | pid_private->effects[id].flags = (1 << FF_PID_FLAGS_USED); | 203 | pid_private->effects[id].flags = (1 << FF_PID_FLAGS_USED); |
| 204 | spin_unlock_irqrestore(&pid_private->lock, flags); | 204 | spin_unlock_irqrestore(&pid_private->lock, flags); |