Fix akmd2 failure; Improve char device

JoeyJiao · Jan 3, 2012 · 5999209 · 5999209
1 parent fa1d871
commit 5999209
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
@@ -1123,8 +1123,8 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
 		return -EINVAL;
 	}
 
-	/* AK: could wrap */
-	if ((pg_start + mem->page_count) > num_entries)
+	if (((pg_start + mem->page_count) > num_entries) ||
+	    ((pg_start + mem->page_count) < pg_start))
 		return -EINVAL;
 
 	j = pg_start;
@@ -1158,7 +1158,7 @@ int agp_generic_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
 {
 	size_t i;
 	struct agp_bridge_data *bridge;
-	int mask_type;
+	int mask_type, num_entries;
 
 	bridge = mem->bridge;
 	if (!bridge)
@@ -1170,6 +1170,11 @@ int agp_generic_remove_memory(struct agp_memory *mem, off_t pg_start, int type)
 	if (type != mem->type)
 		return -EINVAL;
 
+	num_entries = agp_num_entries();
+	if (((pg_start + mem->page_count) > num_entries) ||
+	    ((pg_start + mem->page_count) < pg_start))
+		return -EINVAL;
+
 	mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
 	if (mask_type != 0) {
 		/* The generic routines know nothing of memory types */

diff --git a/drivers/i2c/chips/st303_gs.c b/drivers/i2c/chips/st303_gs.c
@@ -46,8 +46,8 @@
 static struct workqueue_struct *gs_wq;
 static signed short st_sensor_data[3];
 
-#define ST303DLH_I2C_NAME "st_303dlh"
-#define ST303DLM_I2C_NAME "st_303dlm"
+#define ST303DLH_I2C_NAME "ST303DLH"
+#define ST303DLM_I2C_NAME "ST303DLM"
 
 enum
 {

diff --git a/drivers/input/accelerometer/gs_st.c b/drivers/input/accelerometer/gs_st.c
@@ -111,7 +111,7 @@ static inline int reg_write(struct gs_data *gs, int reg, uint8_t val)
 
 static int sensor_data[4];
 /*adjust device name */
-static char st_device_id[] = "st_35de";
+static char st_device_id[] = "ST35DE";
 
 int gs_st_data_to_compass(int accel_data [3])
 {