[Pommed-commits] r526 - trunk/pommed

[jblache at alioth.debian.org]

Author: jblache
Date: 2008-12-11 14:39:59 +0000 (Thu, 11 Dec 2008)
New Revision: 526

Modified:
   trunk/pommed/sysfs_backlight.c
Log:
Rework MBP driver probe code.


Modified: trunk/pommed/sysfs_backlight.c
===================================================================
--- trunk/pommed/sysfs_backlight.c	2008-12-11 14:35:53 UTC (rev 525)
+++ trunk/pommed/sysfs_backlight.c	2008-12-11 14:39:59 UTC (rev 526)
@@ -363,7 +363,9 @@
 {
   return sysfs_backlight_probe(SYSFS_DRIVER_NVIDIA);
 }
+
 #else
+
 int
 mbp_sysfs_backlight_probe(void)
 {
@@ -371,32 +373,33 @@
 
   ret = sysfs_backlight_probe(SYSFS_DRIVER_MBP);
 
-  if (ret < 0)
+  if (ret == 0)
+    return 0;
+
+  /* Probe failed, wire up native driver instead */
+  switch (mops->type)
     {
-      switch (mops->type)
-	{
-	  case MACHINE_MACBOOKPRO_3:
-	  case MACHINE_MACBOOKPRO_4:
-	  case MACHINE_MACBOOKPRO_5:
-	  case MACHINE_MACBOOK_5:
-	  case MACHINE_MACBOOKAIR_2:
-	    logmsg(LOG_INFO, "sysfs backlight probe failed, falling back to nv8600mgt");
+      case MACHINE_MACBOOKPRO_3:
+      case MACHINE_MACBOOKPRO_4:
+      case MACHINE_MACBOOKPRO_5:
+      case MACHINE_MACBOOK_5:
+      case MACHINE_MACBOOKAIR_2:
+	logmsg(LOG_INFO, "sysfs backlight probe failed, falling back to nv8600mgt");
 
-	    ret = nv8600mgt_backlight_probe();
-	    if (ret == 0)
-	      {
-		/* Wire up fallback native driver */
-		mops->lcd_backlight_step = nv8600mgt_backlight_step;
-		mops->lcd_backlight_toggle = nv8600mgt_backlight_toggle;
-	      }
-	    return ret;
+	ret = nv8600mgt_backlight_probe();
+	if (ret == 0)
+	  {
+	    /* Wire up fallback native driver */
+	    mops->lcd_backlight_step = nv8600mgt_backlight_step;
+	    mops->lcd_backlight_toggle = nv8600mgt_backlight_toggle;
+	  }
+	return ret;
 
-	default:
-	  logmsg(LOG_ERR, "sysfs backlight probe failed, no fallback for this machine");
-	  return -1;
-	}
+      default:
+	logmsg(LOG_ERR, "sysfs backlight probe failed, no fallback for this machine");
+	return -1;
     }
 
-  return 0;
+  return -1;
 }
 #endif