Merge

0c5daf6e · Vojtech Pavlik · 3d29bf44 · 9e8626bd · 0c5daf6e
Commit 0c5daf6e authored Oct 11, 2002 by Vojtech Pavlik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

drivers/input/keyboard/atkbd.c drivers/input/keyboard/atkbd.c +3 -2

No files found.
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -244,8 +244,9 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command)

 	while (atkbd->cmdcnt && timeout--) udelay(10);

-	for (i = 0; i < receive; i++)
-		param[i] = atkbd->cmdbuf[(receive - 1) - i];
+	if (param)
+		for (i = 0; i < receive; i++)
+			param[i] = atkbd->cmdbuf[(receive - 1) - i];

 	if (atkbd->cmdcnt) 
 		return (atkbd->cmdcnt = 0) - 1;