5 files changed, 27 insertions, 8 deletions

diff --git a/arch/arm/mach-at91/board-ek.c b/arch/arm/mach-at91/board-ek.c
index d05b1b2be9fb..53a5ef9e72ee 100644
--- a/arch/arm/mach-at91/board-ek.c
+++ b/arch/arm/mach-at91/board-ek.c
@@ -109,6 +109,15 @@ static struct spi_board_info ek_spi_devices[] = {
 #endif
 };
 
+static struct i2c_board_info __initdata ek_i2c_devices[] = {
+        {
+                I2C_BOARD_INFO("ics1523", 0x26),
+        },
+        {
+                I2C_BOARD_INFO("dac3550", 0x4d),
+        }
+};
+
 #define EK_FLASH_BASE   AT91_CHIPSELECT_0
 #define EK_FLASH_SIZE   0x200000
 
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index dcd81f8d0833..9732d5d9466b 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -178,13 +178,19 @@ static void pxa25x_cpu_pm_save(unsigned long *sleep_save)
         SAVE(GAFR1_L); SAVE(GAFR1_U);
         SAVE(GAFR2_L); SAVE(GAFR2_U);
 
-        SAVE(ICMR);
+        SAVE(ICMR); ICMR = 0;
         SAVE(CKEN);
         SAVE(PSTR);
+
+        /* Clear GPIO transition detect bits */
+        GEDR0 = GEDR0; GEDR1 = GEDR1; GEDR2 = GEDR2;
 }
 
 static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)
 {
+        /* ensure not to come back here if it wasn't intended */
+        PSPR = 0;
+
         /* restore registers */
         RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);
         RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
@@ -195,7 +201,12 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)
         RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);
         RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);
 
+        PSSR = PSSR_RDH | PSSR_PH;
+
         RESTORE(CKEN);
+
+        ICLR = 0;
+        ICCR = 1;
         RESTORE(ICMR);
         RESTORE(PSTR);
 }
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index c02d92deacd2..581a3c955739 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3063,11 +3063,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 struct video_mbuf *mbuf = arg;
                 unsigned int i;
 
-                mutex_lock(&fh->cap.lock);
                 retval = videobuf_mmap_setup(&fh->cap,gbuffers,gbufsize,
                                              V4L2_MEMORY_MMAP);
                 if (retval < 0)
-                        goto fh_unlock_and_return;
+                        return retval;
 
                 gbuffers = retval;
                 memset(mbuf,0,sizeof(*mbuf));
@@ -3075,7 +3074,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 mbuf->size   = gbuffers * gbufsize;
                 for (i = 0; i < gbuffers; i++)
                         mbuf->offsets[i] = i * gbufsize;
-                mutex_unlock(&fh->cap.lock);
                 return 0;
         }
         case VIDIOCMCAPTURE:
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 6d2dd8764f81..10d6faf8ccda 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1076,6 +1076,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                 ivtv_process_eeprom(itv);
         }
 
+        /* The mspx4xx chips need a longer delay for some reason */
+        if (!(itv->hw_flags & IVTV_HW_MSP34XX))
+                itv->i2c_algo.udelay = 5;
+
         if (itv->std == 0) {
                 itv->std = V4L2_STD_NTSC_M;
         }
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 44678fe27a04..36e54f78aa2a 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -541,7 +541,7 @@ static const struct i2c_algo_bit_data ivtv_i2c_algo_template = {
         .setscl         = ivtv_setscl_old,
         .getsda         = ivtv_getsda_old,
         .getscl         = ivtv_getscl_old,
-        .udelay         = 5,
+        .udelay         = 10,
         .timeout        = 200,
 };
 
@@ -718,9 +718,6 @@ int init_ivtv_i2c(struct ivtv *itv)
                        sizeof(struct i2c_adapter));
                 memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template,
                        sizeof(struct i2c_algo_bit_data));
-                /* The mspx4xx chips need a longer delay for some reason */
-                if (itv->hw_flags & IVTV_HW_MSP34XX)
-                        itv->i2c_algo.udelay = 10;
                 itv->i2c_algo.data = itv;
                 itv->i2c_adap.algo_data = &itv->i2c_algo;
         }