Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b30fbde authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

oss: fix O_NONBLOCK in dmasound_core 



We broke O_NONBLOCK handling in OSS dmasound_core in 2.3.11-pre3 - the
original code copied f_flags to open_mode and then checked for
O_NONBLOCK in there, but that got changed to copying f_mode and
O_NONBLOCK has not reached that field in any kernel version.

Since we do not care for any other bits, the fix is obvious...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 67d11284

sound/oss/dmasound/dmasound.h

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ struct sound_queue { 
     */

    int active;

    wait_queue_head_t action_queue, open_queue, sync_queue;

    fmode_t open_mode;

    int non_blocking;

    int busy, syncing, xruns, died;

};

sound/oss/dmasound/dmasound_core.c

+2 −2
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static ssize_t sq_write(struct file *file, const char __user *src, size_t uLeft, 
	while (uLeft) {

		while (write_sq.count >= write_sq.max_active) {

			sq_play();

			if (write_sq.open_mode & O_NONBLOCK)

			if (write_sq.non_blocking)

				return uWritten > 0 ? uWritten : -EAGAIN;

			SLEEP(write_sq.action_queue);

			if (signal_pending(current))
@@ -718,7 +718,7 @@ static int sq_open2(struct sound_queue *sq, struct file *file, fmode_t mode, 
			return rc;

		}



		sq->open_mode = file->f_mode;

		sq->non_blocking = file->f_flags & O_NONBLOCK;

	}

	return rc;

}