---

yaml --- r: 171074 b: refs/heads/master c: ed3f2e4 h: refs/heads/master v: v3
git-mirror · Oct 29, 2009 · 7c22ec3 · 7c22ec3
1 parent 2e3c733
commit 7c22ec3
Show file tree

Hide file tree

Showing 145 changed files with 10,292 additions and 3,653 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd6b4442ff3cee73f73987cf0c0e66ea677aa075
+refs/heads/master: ed3f2e40f3d438f4a1ec0a898173116cb26f106a
diff --git a/trunk/drivers/atm/fore200e.c b/trunk/drivers/atm/fore200e.c
@@ -2906,8 +2906,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
 	u32 media_index    = FORE200E_MEDIA_INDEX(fore200e->bus->read(&fore200e->cp_queues->media_type));
 	u32 oc3_index;
 
-	if ((media_index < 0) || (media_index > 4))
-	    media_index = 5;
+	if (media_index > 4)
+		media_index = 5;
 
 	switch (fore200e->loop_mode) {
 	    case ATM_LM_NONE:    oc3_index = 0;

diff --git a/trunk/drivers/atm/he.c b/trunk/drivers/atm/he.c
@@ -2739,7 +2739,7 @@ he_ioctl(struct atm_dev *atm_dev, unsigned int cmd, void __user *arg)
 			spin_lock_irqsave(&he_dev->global_lock, flags);
 			switch (reg.type) {
 				case HE_REGTYPE_PCI:
-					if (reg.addr < 0 || reg.addr >= HE_REGMAP_SIZE) {
+					if (reg.addr >= HE_REGMAP_SIZE) {
 						err = -EINVAL;
 						break;
 					}