From 8f5fc534f3aa0a7f35d24ad4c2e1ae8fdfa39203 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 9 Sep 2010 00:11:41 +0200
Subject: [PATCH] --- yaml --- r: 210495 b: refs/heads/master c:
 a7a13d0676335a7dc9dd72264cca02606e43aaba h: refs/heads/master i:   210493:
 ef095e42aaa6c19d8304a9ced712da9e27ce9c21   210491:
 b67ecb868f3b80b516e8722e7ca9874b85b66d7e   210487:
 809ea686c4d91756dd30aabd1b175b8b842830fc   210479:
 e632fbcecf3b43ff01a242e5fb32b964ffea0203   210463:
 e9c084011af78196404ea003fa01d5eb7e1242a0   210431:
 45cf26c7e63351cc7e6022d4b8bfd9a293f3eb88 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/core/rawmidi.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb889640279e..dd040da1797a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27f7ad53829f79e799a253285318bff79ece15bd
+refs/heads/master: a7a13d0676335a7dc9dd72264cca02606e43aaba
diff --git a/trunk/sound/core/rawmidi.c b/trunk/sound/core/rawmidi.c
index eb68326c37d4..a7868ad4d530 100644
--- a/trunk/sound/core/rawmidi.c
+++ b/trunk/sound/core/rawmidi.c
@@ -829,6 +829,8 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,
 		
 		if (get_user(device, (int __user *)argp))
 			return -EFAULT;
+		if (device >= SNDRV_RAWMIDI_DEVICES) /* next device is -1 */
+			device = SNDRV_RAWMIDI_DEVICES - 1;
 		mutex_lock(&register_mutex);
 		device = device < 0 ? 0 : device + 1;
 		while (device < SNDRV_RAWMIDI_DEVICES) {