diff --git a/[refs] b/[refs]
index 638d564b1a73..c05658c7e2ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2102d31de1f0ddb9ced62d65d2ed89a5149ea39
+refs/heads/master: 25477f2398f39a35f110e02f6c7d8dd1023c47c1
diff --git a/trunk/drivers/staging/batman-adv/device.c b/trunk/drivers/staging/batman-adv/device.c
index 7eb6559e0315..32204b5572d0 100644
--- a/trunk/drivers/staging/batman-adv/device.c
+++ b/trunk/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);
 }