Changeset 28767


Ignore:
Timestamp:
2011-11-05T17:10:18+01:00 (6 years ago)
Author:
mb
Message:

omap24xx: Add cbus tahvo locking fix.

Location:
trunk/target/linux/omap24xx/patches-3.1
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch

    r28766 r28767  
    11Index: linux-3.1/drivers/cbus/Kconfig 
    22=================================================================== 
    3 --- linux-3.1.orig/drivers/cbus/Kconfig 2011-11-05 15:02:39.041041166 +0100 
    4 +++ linux-3.1/drivers/cbus/Kconfig      2011-11-05 15:02:39.177041045 +0100 
     3--- linux-3.1.orig/drivers/cbus/Kconfig 2011-11-05 17:03:39.578846146 +0100 
     4+++ linux-3.1/drivers/cbus/Kconfig      2011-11-05 17:06:51.589348749 +0100 
    55@@ -83,4 +83,12 @@ config CBUS_RETU_HEADSET 
    66  
     
    1818Index: linux-3.1/drivers/cbus/Makefile 
    1919=================================================================== 
    20 --- linux-3.1.orig/drivers/cbus/Makefile        2011-11-05 15:02:39.041041166 +0100 
    21 +++ linux-3.1/drivers/cbus/Makefile     2011-11-05 15:02:39.177041045 +0100 
     20--- linux-3.1.orig/drivers/cbus/Makefile        2011-11-05 17:03:39.618846091 +0100 
     21+++ linux-3.1/drivers/cbus/Makefile     2011-11-05 17:06:51.589348749 +0100 
    2222@@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r 
    2323 obj-$(CONFIG_CBUS_RETU_RTC)    += retu-rtc.o 
     
    3030=================================================================== 
    3131--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    32 +++ linux-3.1/drivers/cbus/n810bm_main.c        2011-11-05 16:42:53.033998545 +0100 
     32+++ linux-3.1/drivers/cbus/n810bm_main.c        2011-11-05 17:06:51.589348749 +0100 
    3333@@ -0,0 +1,1572 @@ 
    3434+/* 
     
    16071607=================================================================== 
    16081608--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    1609 +++ linux-3.1/drivers/cbus/lipocharge.c 2011-11-05 15:02:39.177041045 +0100 
     1609+++ linux-3.1/drivers/cbus/lipocharge.c 2011-11-05 17:06:51.589348749 +0100 
    16101610@@ -0,0 +1,183 @@ 
    16111611+/* 
     
    17951795=================================================================== 
    17961796--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    1797 +++ linux-3.1/drivers/cbus/lipocharge.h 2011-11-05 15:02:39.177041045 +0100 
     1797+++ linux-3.1/drivers/cbus/lipocharge.h 2011-11-05 17:06:51.589348749 +0100 
    17981798@@ -0,0 +1,60 @@ 
    17991799+#ifndef LIPOCHARGE_H_ 
     
    18591859Index: linux-3.1/drivers/cbus/cbus.c 
    18601860=================================================================== 
    1861 --- linux-3.1.orig/drivers/cbus/cbus.c  2011-11-05 15:02:39.041041166 +0100 
    1862 +++ linux-3.1/drivers/cbus/cbus.c       2011-11-05 15:02:39.177041045 +0100 
     1861--- linux-3.1.orig/drivers/cbus/cbus.c  2011-11-05 17:03:39.610846102 +0100 
     1862+++ linux-3.1/drivers/cbus/cbus.c       2011-11-05 17:06:51.589348749 +0100 
    18631863@@ -34,6 +34,7 @@ 
    18641864 #include <linux/gpio.h> 
     
    18851885Index: linux-3.1/drivers/cbus/cbus.h 
    18861886=================================================================== 
    1887 --- linux-3.1.orig/drivers/cbus/cbus.h  2011-11-05 15:02:39.041041166 +0100 
    1888 +++ linux-3.1/drivers/cbus/cbus.h       2011-11-05 15:02:39.177041045 +0100 
     1887--- linux-3.1.orig/drivers/cbus/cbus.h  2011-11-05 17:03:39.590846131 +0100 
     1888+++ linux-3.1/drivers/cbus/cbus.h       2011-11-05 17:06:51.589348749 +0100 
    18891889@@ -27,4 +27,6 @@ extern int cbus_read_reg(struct device * 
    18901890 extern int cbus_write_reg(struct device *, unsigned dev, unsigned reg, 
     
    18961896Index: linux-3.1/drivers/cbus/retu.c 
    18971897=================================================================== 
    1898 --- linux-3.1.orig/drivers/cbus/retu.c  2011-11-05 15:02:39.041041166 +0100 
    1899 +++ linux-3.1/drivers/cbus/retu.c       2011-11-05 15:02:39.177041045 +0100 
     1898--- linux-3.1.orig/drivers/cbus/retu.c  2011-11-05 17:03:39.606846106 +0100 
     1899+++ linux-3.1/drivers/cbus/retu.c       2011-11-05 17:06:51.589348749 +0100 
    19001900@@ -417,6 +417,11 @@ static int retu_allocate_children(struct 
    19011901        if (!child) 
     
    19121912Index: linux-3.1/drivers/cbus/tahvo.c 
    19131913=================================================================== 
    1914 --- linux-3.1.orig/drivers/cbus/tahvo.c 2011-11-05 15:02:39.041041166 +0100 
    1915 +++ linux-3.1/drivers/cbus/tahvo.c      2011-11-05 16:23:10.694222186 +0100 
    1916 @@ -129,6 +129,7 @@ void tahvo_set_clear_reg_bits(struct dev 
     1914--- linux-3.1.orig/drivers/cbus/tahvo.c 2011-11-05 17:04:36.274768324 +0100 
     1915+++ linux-3.1/drivers/cbus/tahvo.c      2011-11-05 17:06:51.589348749 +0100 
     1916@@ -131,6 +131,7 @@ void tahvo_set_clear_reg_bits(struct dev 
    19171917        __tahvo_write_reg(tahvo, reg, w); 
    19181918        mutex_unlock(&tahvo->mutex); 
     
    19221922 static irqreturn_t tahvo_irq_handler(int irq, void *_tahvo) 
    19231923 { 
    1924 @@ -305,6 +306,11 @@ static int tahvo_allocate_children(struc 
     1924@@ -307,6 +308,11 @@ static int tahvo_allocate_children(struc 
    19251925        if (!child) 
    19261926                return -ENOMEM; 
Note: See TracChangeset for help on using the changeset viewer.