diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-30 15:45:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-30 15:45:59 -0700 |
| commit | 980019d74e4b2428362b36a0506519d6d9460800 (patch) | |
| tree | a71cc0452db76f6c5fdee2611d0d7d39f22f8e69 /drivers/staging/batman-adv/device.c | |
| parent | 9f2952dbcbc0a143cff19f2e44fc504901aad86f (diff) | |
| parent | e10ac155828324c475637827d4c3525012391f02 (diff) | |
| download | op-kernel-dev-980019d74e4b2428362b36a0506519d6d9460800.zip op-kernel-dev-980019d74e4b2428362b36a0506519d6d9460800.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: rtl8192u_usb: Add LG device ID 043e:7a01
Staging: rtl8192s_usb: Remove duplicate device ID
Staging: rt2870: add device id for Zyxel NWD-270N
Staging: comedi: fix read past end of array in cb_pcidda_attach()
Staging: rtl8192su: add device ids
Staging: rtl8192su: remove device ids
Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2
Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set
Staging: wlags49_h2: add missing <linux/string.h> for strlen
Staging: hv: fix hv_utils module to properly autoload
staging: hv: Fix race condition on vmbus channel initialization
Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case
Staging: mrst-touchscreen: fix dereferencing free memory
Staging: batman-adv: fix function prototype
Staging: batman-adv: return -EFAULT on copy_to_user errors
staging: usbip: usbip_common: kill rx thread on tx thread creation error.
Diffstat (limited to 'drivers/staging/batman-adv/device.c')
| -rw-r--r-- | drivers/staging/batman-adv/device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c index 7eb6559..32204b5 100644 --- a/drivers/staging/batman-adv/device.c +++ b/drivers/staging/batman-adv/device.c @@ -196,7 +196,7 @@ ssize_t bat_device_read(struct file *file, char __user *buf, size_t count, kfree(device_packet); if (error) - return error; + return -EFAULT; return sizeof(struct icmp_packet); } |
