diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
| commit | 7426ef52b42ebd54ba85133ffd29132e008a882c (patch) | |
| tree | 5232ca850065baf025e8d7384408b48b4b462c96 /drivers/hid/hidraw.c | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
| parent | a8ab5d58b0238b8199cc699b8dff7c5e1da24138 (diff) | |
| download | linux-7426ef52b42ebd54ba85133ffd29132e008a882c.tar.gz linux-7426ef52b42ebd54ba85133ffd29132e008a882c.tar.bz2 linux-7426ef52b42ebd54ba85133ffd29132e008a882c.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-wacom.c
Diffstat (limited to 'drivers/hid/hidraw.c')
| -rw-r--r-- | drivers/hid/hidraw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 6eadf1a9b3cc..a9becf9cd0f6 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -311,7 +311,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, -EFAULT : len; break; } - } + } ret = -ENOTTY; } |