From bdc597b091350dce7c73d40bfd362a79f69ab0e0 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 9 Dec 2010 15:52:39 +0100 Subject: [PATCH] --- yaml --- r: 226962 b: refs/heads/master c: 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_fs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a27db753dfee..0db2877a744c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16325f18eaa6066c4b913a5661fc8190ce564f7c +refs/heads/master: 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2 diff --git a/trunk/drivers/usb/gadget/f_fs.c b/trunk/drivers/usb/gadget/f_fs.c index 255969cd1639..1b7ae7c9d683 100644 --- a/trunk/drivers/usb/gadget/f_fs.c +++ b/trunk/drivers/usb/gadget/f_fs.c @@ -427,7 +427,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, } data = ffs_prepare_buffer(buf, len); - if (unlikely(IS_ERR(data))) { + if (IS_ERR(data)) { ret = PTR_ERR(data); break; } @@ -500,7 +500,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, spin_unlock_irq(&ffs->ev.waitq.lock); data = ffs_prepare_buffer(buf, len); - if (unlikely(IS_ERR(data))) { + if (IS_ERR(data)) { ret = PTR_ERR(data); break; }