Merge commit 'upstream/master'

[linux-2.6] / drivers / char / synclink_gt.c

diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 5ffdb364ea4093cec29ff306779ebdc77ff11ab4..3e9058993e41805c0b2cd699ad836c76844fe398 100644 (file)
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -2686,8 +2686,10 @@ static int rx_enable(struct slgt_info *info, int enable)
         */
        rbuf_fill_level = ((unsigned int)enable) >> 16;
        if (rbuf_fill_level) {
-               if ((rbuf_fill_level > DMABUFSIZE) || (rbuf_fill_level % 4))
+               if ((rbuf_fill_level > DMABUFSIZE) || (rbuf_fill_level % 4)) {
+                       spin_unlock_irqrestore(&info->lock, flags);
                        return -EINVAL;
+               }
                info->rbuf_fill_level = rbuf_fill_level;
                rx_stop(info); /* restart receiver to use new fill level */
        }