diff options
author | Michal Nazarewicz <mina86@mina86.com> | 2014-02-10 04:42:40 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-02-18 11:53:00 -0500 |
commit | e46318a00091e3e009363a516acc44a4a80e2ebb (patch) | |
tree | 6c65e4cd869891ac0dbb2de42cd7c8fe4966df1e /drivers/usb/gadget/f_fs.c | |
parent | da13a7738e87a5adecbd8741191ceabfc056767b (diff) |
usb: gadget: functionfs: fix typo in the enum variable
Since “cancelled” is spelled with two “l”s, rename FFS_SETUP_CANCELED
to FFS_SETUP_CANCELLED.
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_fs.c')
-rw-r--r-- | drivers/usb/gadget/f_fs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index fffda6113b0f..eb5cb2b4b90d 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c | |||
@@ -246,7 +246,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, | |||
246 | ENTER(); | 246 | ENTER(); |
247 | 247 | ||
248 | /* Fast check if setup was canceled */ | 248 | /* Fast check if setup was canceled */ |
249 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELED) | 249 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) |
250 | return -EIDRM; | 250 | return -EIDRM; |
251 | 251 | ||
252 | /* Acquire mutex */ | 252 | /* Acquire mutex */ |
@@ -313,7 +313,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, | |||
313 | */ | 313 | */ |
314 | spin_lock_irq(&ffs->ev.waitq.lock); | 314 | spin_lock_irq(&ffs->ev.waitq.lock); |
315 | switch (FFS_SETUP_STATE(ffs)) { | 315 | switch (FFS_SETUP_STATE(ffs)) { |
316 | case FFS_SETUP_CANCELED: | 316 | case FFS_SETUP_CANCELLED: |
317 | ret = -EIDRM; | 317 | ret = -EIDRM; |
318 | goto done_spin; | 318 | goto done_spin; |
319 | 319 | ||
@@ -348,7 +348,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, | |||
348 | /* | 348 | /* |
349 | * We are guaranteed to be still in FFS_ACTIVE state | 349 | * We are guaranteed to be still in FFS_ACTIVE state |
350 | * but the state of setup could have changed from | 350 | * but the state of setup could have changed from |
351 | * FFS_SETUP_PENDING to FFS_SETUP_CANCELED so we need | 351 | * FFS_SETUP_PENDING to FFS_SETUP_CANCELLED so we need |
352 | * to check for that. If that happened we copied data | 352 | * to check for that. If that happened we copied data |
353 | * from user space in vain but it's unlikely. | 353 | * from user space in vain but it's unlikely. |
354 | * | 354 | * |
@@ -357,7 +357,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, | |||
357 | * transition can be performed and it's protected by | 357 | * transition can be performed and it's protected by |
358 | * mutex. | 358 | * mutex. |
359 | */ | 359 | */ |
360 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELED) { | 360 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) { |
361 | ret = -EIDRM; | 361 | ret = -EIDRM; |
362 | done_spin: | 362 | done_spin: |
363 | spin_unlock_irq(&ffs->ev.waitq.lock); | 363 | spin_unlock_irq(&ffs->ev.waitq.lock); |
@@ -423,7 +423,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, | |||
423 | ENTER(); | 423 | ENTER(); |
424 | 424 | ||
425 | /* Fast check if setup was canceled */ | 425 | /* Fast check if setup was canceled */ |
426 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELED) | 426 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) |
427 | return -EIDRM; | 427 | return -EIDRM; |
428 | 428 | ||
429 | /* Acquire mutex */ | 429 | /* Acquire mutex */ |
@@ -444,7 +444,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, | |||
444 | spin_lock_irq(&ffs->ev.waitq.lock); | 444 | spin_lock_irq(&ffs->ev.waitq.lock); |
445 | 445 | ||
446 | switch (FFS_SETUP_STATE(ffs)) { | 446 | switch (FFS_SETUP_STATE(ffs)) { |
447 | case FFS_SETUP_CANCELED: | 447 | case FFS_SETUP_CANCELLED: |
448 | ret = -EIDRM; | 448 | ret = -EIDRM; |
449 | break; | 449 | break; |
450 | 450 | ||
@@ -491,7 +491,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, | |||
491 | spin_lock_irq(&ffs->ev.waitq.lock); | 491 | spin_lock_irq(&ffs->ev.waitq.lock); |
492 | 492 | ||
493 | /* See ffs_ep0_write() */ | 493 | /* See ffs_ep0_write() */ |
494 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELED) { | 494 | if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) { |
495 | ret = -EIDRM; | 495 | ret = -EIDRM; |
496 | break; | 496 | break; |
497 | } | 497 | } |
@@ -1786,7 +1786,7 @@ static void __ffs_event_add(struct ffs_data *ffs, | |||
1786 | * the source does nothing. | 1786 | * the source does nothing. |
1787 | */ | 1787 | */ |
1788 | if (ffs->setup_state == FFS_SETUP_PENDING) | 1788 | if (ffs->setup_state == FFS_SETUP_PENDING) |
1789 | ffs->setup_state = FFS_SETUP_CANCELED; | 1789 | ffs->setup_state = FFS_SETUP_CANCELLED; |
1790 | 1790 | ||
1791 | switch (type) { | 1791 | switch (type) { |
1792 | case FUNCTIONFS_RESUME: | 1792 | case FUNCTIONFS_RESUME: |