Relese kernel-power v51r1

* Fix bug in bq2415x_charger driver which cause reboot when driver is unloaded

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 83b6e34..2e8f091 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,9 @@
+kernel-power (1:2.6.28-10power51r1) fremantle; urgency=low
+
+  * Fix bug in bq2415x_charger driver which cause reboot when driver is unloaded
+
+ -- Pali Rohár <pali.rohar@gmail.com>  Mon, 23 Jul 2012 13:36:02 +0200
+
 kernel-power (1:2.6.28-10power51) fremantle; urgency=low
 
   * Added bq2415x charger driver (blacklisted by default)

diff --git a/kernel-power-2.6.28/debian/madde.patch b/kernel-power-2.6.28/debian/madde.patch
index 9ef25fb..4041de8 100644 (file)
--- a/kernel-power-2.6.28/debian/madde.patch
+++ b/kernel-power-2.6.28/debian/madde.patch
@@ -36,7 +36,7 @@ index a78394b..25397d5 100755
 +MADDE_PATH := $(HOME)/.madde/$(MADDE_VERSION)/toolchains/$(MADDE_TOOLCHAIN)/bin
 +export PATH := $(MADDE_PATH):$(PATH)
 +
- RELEASE := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*\)/\1/p' | sed 's/-10/.10-/')
+ RELEASE := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*\)/\1/p' | sed 's/-10/.10-/' | sed 's/r[0-9]*$$//')
  REVISION := $(shell echo "$(RELEASE)" | sed 's/.*\./\./')
  EXTRAVERSION := EXTRAVERSION=$(REVISION)
 @@ -134,9 +139,9 @@ install-debug: install-modules

diff --git a/kernel-power-2.6.28/debian/patches/bq2415x_rx51.patch b/kernel-power-2.6.28/debian/patches/bq2415x_rx51.patch
index e53c9b2..ce7dc9c 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/bq2415x_rx51.patch
+++ b/kernel-power-2.6.28/debian/patches/bq2415x_rx51.patch
@@ -155,7 +155,7 @@
  
  #define RX51_DEBUG_BASE                       0x08000000  /* debug board */
  #define RX51_ETHR_START                       RX51_DEBUG_BASE
-@@ -563,6 +565,81 @@ static struct i2c_board_info __initdata
+@@ -563,6 +565,82 @@ static struct i2c_board_info __initdata
        },
  };
  
@@ -171,7 +171,8 @@
 +{
 +      rx51_charger_hook = hook;
 +      rx51_charger_hook_data = data;
-+      rx51_charger_hook(rx51_charger_mode, rx51_charger_hook_data);
++      if (rx51_charger_hook)
++              rx51_charger_hook(rx51_charger_mode, rx51_charger_hook_data);
 +      return 1;
 +}
 +
@@ -237,7 +238,7 @@
  static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
        {
                I2C_BOARD_INFO("lp5523", 0x32),
-@@ -575,6 +637,10 @@ static struct i2c_board_info __initdata
+@@ -575,6 +638,10 @@ static struct i2c_board_info __initdata
        {
                I2C_BOARD_INFO("bq27200", 0x55),
        },

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index 1648508..38f7d40 100755 (executable)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 
-RELEASE := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*\)/\1/p' | sed 's/-10/.10-/')
+RELEASE := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 1:\(.*\)/\1/p' | sed 's/-10/.10-/' | sed 's/r[0-9]*$$//')
 REVISION := $(shell echo "$(RELEASE)" | sed 's/.*\./\./')
 EXTRAVERSION := EXTRAVERSION=$(REVISION)