aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-12-09 09:52:39 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-10 17:18:36 -0500
commit537baabbdfebe7f9514f05b62eac91b4bfa0bdf2 (patch)
treee1c9d86a11d551baefb731424268d12b7dd723bd /drivers
parent16325f18eaa6066c4b913a5661fc8190ce564f7c (diff)
usb: gadget: f_fs: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/f_fs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 255969cd1639..1b7ae7c9d683 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -427,7 +427,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
427 } 427 }
428 428
429 data = ffs_prepare_buffer(buf, len); 429 data = ffs_prepare_buffer(buf, len);
430 if (unlikely(IS_ERR(data))) { 430 if (IS_ERR(data)) {
431 ret = PTR_ERR(data); 431 ret = PTR_ERR(data);
432 break; 432 break;
433 } 433 }
@@ -500,7 +500,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
500 spin_unlock_irq(&ffs->ev.waitq.lock); 500 spin_unlock_irq(&ffs->ev.waitq.lock);
501 501
502 data = ffs_prepare_buffer(buf, len); 502 data = ffs_prepare_buffer(buf, len);
503 if (unlikely(IS_ERR(data))) { 503 if (IS_ERR(data)) {
504 ret = PTR_ERR(data); 504 ret = PTR_ERR(data);
505 break; 505 break;
506 } 506 }