Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / speakup / kobjects.c

diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index 528cbdce4227e95579694a41e14b9873c2963b6d..7fedee363455a70299208273ffc9efea6c1c9731 100644 (file)
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -411,11 +411,13 @@ static ssize_t synth_direct_store(struct kobject *kobj,
        int len;
        int bytes;
        const char *ptr = buf;
+       unsigned long flags;
 
        if (!synth)
                return -EPERM;
 
        len = strlen(buf);
+       spin_lock_irqsave(&speakup_info.spinlock, flags);
        while (len > 0) {
                bytes = min_t(size_t, len, 250);
                strncpy(tmp, ptr, bytes);
@@ -425,6 +427,7 @@ static ssize_t synth_direct_store(struct kobject *kobj,
                ptr += bytes;
                len -= bytes;
        }
+       spin_unlock_irqrestore(&speakup_info.spinlock, flags);
        return count;
 }