From 591a074d3f1ca850ff61ee7dca344ff20ad80377 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 15 May 2010 11:46:36 +0200
Subject: [PATCH] --- yaml --- r: 196318 b: refs/heads/master c:
 aeacb6fd30c800e8229905eac7023777a472d772 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/hid/hid-picolcd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bb1fb547ca3..df750407136d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d71ea057bc4823058d8fe27d34e987eb9880457
+refs/heads/master: aeacb6fd30c800e8229905eac7023777a472d772
diff --git a/trunk/drivers/hid/hid-picolcd.c b/trunk/drivers/hid/hid-picolcd.c
index 95253b310541..7aabf65c48ef 100644
--- a/trunk/drivers/hid/hid-picolcd.c
+++ b/trunk/drivers/hid/hid-picolcd.c
@@ -1616,7 +1616,7 @@ static ssize_t _picolcd_flash_write(struct picolcd_data *data, int report_id,
 		raw_data[len_off] = s > 32 ? 32 : s;
 		if (copy_from_user(raw_data+len_off+1, u, raw_data[len_off])) {
 			err = -EFAULT;
-			goto skip;
+			break;
 		}
 		resp = picolcd_send_and_wait(data->hdev, report_id, raw_data,
 				len_off+1+raw_data[len_off]);