git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
s2255drv.c
diff --git
a/drivers/media/video/s2255drv.c
b/drivers/media/video/s2255drv.c
index
b63f8ca
..
561909b
100644
(file)
--- a/
drivers/media/video/s2255drv.c
+++ b/
drivers/media/video/s2255drv.c
@@
-57,7
+57,7
@@
#include <linux/usb.h>
#define S2255_MAJOR_VERSION 1
#include <linux/usb.h>
#define S2255_MAJOR_VERSION 1
-#define S2255_MINOR_VERSION 2
0
+#define S2255_MINOR_VERSION 2
1
#define S2255_RELEASE 0
#define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \
S2255_MINOR_VERSION, \
#define S2255_RELEASE 0
#define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \
S2255_MINOR_VERSION, \
@@
-312,9
+312,9
@@
struct s2255_fh {
};
/* current cypress EEPROM firmware version */
};
/* current cypress EEPROM firmware version */
-#define S2255_CUR_USB_FWVER ((3 << 8) |
6
)
+#define S2255_CUR_USB_FWVER ((3 << 8) |
11
)
/* current DSP FW version */
/* current DSP FW version */
-#define S2255_CUR_DSP_FWVER
8
+#define S2255_CUR_DSP_FWVER
10102
/* Need DSP version 5+ for video status feature */
#define S2255_MIN_DSP_STATUS 5
#define S2255_MIN_DSP_COLORFILTER 8
/* Need DSP version 5+ for video status feature */
#define S2255_MIN_DSP_STATUS 5
#define S2255_MIN_DSP_COLORFILTER 8
@@
-492,9
+492,11
@@
static void planar422p_to_yuv_packed(const unsigned char *in,
static void s2255_reset_dsppower(struct s2255_dev *dev)
{
static void s2255_reset_dsppower(struct s2255_dev *dev)
{
- s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b0
b
, NULL, 0, 1);
+ s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b0
1
, NULL, 0, 1);
msleep(10);
s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1);
msleep(10);
s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1);
+ msleep(600);
+ s2255_vendor_req(dev, 0x10, 0x0000, 0x0000, NULL, 0, 1);
return;
}
return;
}