*** hiddev.c.orig	Sun Jul 20 00:46:11 2003
--- hiddev.c	Sun Jul 20 00:47:08 2003
***************
*** 477,483 ****
  			return -EINVAL;
  
  		field = report->field[uref.field_index];
! 		if (uref.usage_index >= field->maxusage)
  			return -EINVAL;
  
  		uref.usage_code = field->usage[uref.usage_index].hid;
--- 477,483 ----
  			return -EINVAL;
  
  		field = report->field[uref.field_index];
! 		if (uref.usage_index >= field->report_count)
  			return -EINVAL;
  
  		uref.usage_code = field->usage[uref.usage_index].hid;
***************
*** 502,508 ****
  				return -EINVAL;
  
  			field = report->field[uref.field_index];
! 			if (uref.usage_index >= field->maxusage)
  				return -EINVAL;
  		}
  
--- 502,508 ----
  				return -EINVAL;
  
  			field = report->field[uref.field_index];
! 			if (uref.usage_index >= field->report_count)
  				return -EINVAL;
  		}
  
***************
*** 531,537 ****
  				return -EINVAL;
  
  			field = report->field[uref.field_index];
! 			if (uref.usage_index >= field->maxusage)
  				return -EINVAL;
  		}
  
--- 531,537 ----
  				return -EINVAL;
  
  			field = report->field[uref.field_index];
! 			if (uref.usage_index >= field->report_count)
  				return -EINVAL;
  		}