1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index e86d2062a164..ed57a890c643 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoechr.c
  * AoE character device driver
@@ -86,34 +86,34 @@ revalidate(const char __user *str, size_t size)
         if (copy_from_user(buf, str, size))
                 return -EFAULT;
 
-        /* should be e%d.%d format */
         n = sscanf(buf, "e%d.%d", &major, &minor);
         if (n != 2) {
-                printk(KERN_ERR "aoe: invalid device specification\n");
+                pr_err("aoe: invalid device specification %s\n", buf);
                 return -EINVAL;
         }
-        d = aoedev_by_aoeaddr(major, minor);
+        d = aoedev_by_aoeaddr(major, minor, 0);
         if (!d)
                 return -EINVAL;
         spin_lock_irqsave(&d->lock, flags);
         aoecmd_cleanslate(d);
+        aoecmd_cfg(major, minor);
 loop:
         skb = aoecmd_ata_id(d);
         spin_unlock_irqrestore(&d->lock, flags);
         /* try again if we are able to sleep a bit,
          * otherwise give up this revalidation
          */
-        if (!skb && !msleep_interruptible(200)) {
+        if (!skb && !msleep_interruptible(250)) {
                 spin_lock_irqsave(&d->lock, flags);
                 goto loop;
         }
+        aoedev_put(d);
         if (skb) {
                 struct sk_buff_head queue;
                 __skb_queue_head_init(&queue);
                 __skb_queue_tail(&queue, skb);
                 aoenet_xmit(&queue);
         }
-        aoecmd_cfg(major, minor);
         return 0;
 }
 
@@ -174,6 +174,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
                 break;
         case MINOR_FLUSH:
                 ret = aoedev_flush(buf, cnt);
+                break;
         }
         if (ret == 0)
                 ret = cnt;