From: Ryan CHEN <ryan.chen@st.com>
Date: Wed, 20 Aug 2008 17:00:17 +0000 (-0400)
Subject: Correct drv_usb_kbd_init function
X-Git-Tag: v2008.10-rc1~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b20fd83c73c22acfcb0c6663be747bd5c8b7011;p=u-boot

Correct drv_usb_kbd_init function

The patch is that check if usb_get_dev_index() function return valid
pointer. If valid, continue. Otherwise return -1.

Signed-off-by: Ryan Chen <ryan.chen@st.com>
Acked-by: Markus Klotzbuecher <mk@denx.de>
---

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 108bd60f95..920bb0ffbe 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -162,6 +162,8 @@ int drv_usb_kbd_init(void)
 	/* scan all USB Devices */
 	for(i=0;i<USB_MAX_DEVICE;i++) {
 		dev=usb_get_dev_index(i); /* get device */
+		if(dev == NULL)
+			return -1;
 		if(dev->devnum!=-1) {
 			if(usb_kbd_probe(dev,0)==1) { /* Ok, we found a keyboard */
 				/* check, if it is already registered */