diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-18 18:08:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-18 18:08:02 -0500 |
commit | a310410f616c78f24490de1274487a7b7b137d97 (patch) | |
tree | dbc2fc187800e6e7014263bf83e10d0155620029 /drivers/media/usb/hdpvr/hdpvr-core.c | |
parent | cdd278db0e3dd714e8076e58f723f3c59547591b (diff) | |
parent | 80f93c7b0f4599ffbdac8d964ecd1162b8b618b9 (diff) |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
"This series include:
- a new Remote Controller driver for ST SoC with the corresponding DT
bindings
- a new frontend (cx24117)
- a new I2C camera flash driver (lm3560)
- a new mem2mem driver for TI SoC (ti-vpe)
- support for Raphael r828d added to r820t driver
- some improvements on buffer allocation at VB2 core
- usual driver fixes and improvements
PS this time, we have a smaller number of patches. While it is hard
to pinpoint to the reasons, I believe that it is mainly due to:
1) there are several patch series ready, but depending on DT review.
I decided to grant some extra time for DT maintainers to look on
it, as they're expecting to have more time with the changes agreed
during ARM mini-summit and KS. If they can't review in time for
3.14, I'll review myself and apply for the next merge window.
2) I suspect that having both LinuxCon EU and LinuxCon NA happening
during the same merge window affected the development
productivity, as several core media developers participated on
both events"
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (151 commits)
[media] media: st-rc: Add ST remote control driver
[media] gpio-ir-recv: Include linux/of.h header
[media] tvp7002: Include linux/of.h header
[media] tvp514x: Include linux/of.h header
[media] ths8200: Include linux/of.h header
[media] adv7343: Include linux/of.h header
[media] v4l: Fix typo in v4l2_subdev_get_try_crop()
[media] media: i2c: add driver for dual LED Flash, lm3560
[media] rtl28xxu: add 15f4:0131 Astrometa DVB-T2
[media] rtl28xxu: add RTL2832P + R828D support
[media] rtl2832: add new tuner R828D
[media] r820t: add support for R828D
[media] media/i2c: ths8200: fix build failure with gcc 4.5.4
[media] Add support for KWorld UB435-Q V2
[media] staging/media: fix msi3101 build errors
[media] ddbridge: Remove casting the return value which is a void pointer
[media] ngene: Remove casting the return value which is a void pointer
[media] dm1105: remove unneeded not-null test
[media] sh_mobile_ceu_camera: remove deprecated IRQF_DISABLED
[media] media: rcar_vin: Add preliminary r8a7790 support
...
Diffstat (limited to 'drivers/media/usb/hdpvr/hdpvr-core.c')
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c index 6e5070774dc2..2f0c89cbac76 100644 --- a/drivers/media/usb/hdpvr/hdpvr-core.c +++ b/drivers/media/usb/hdpvr/hdpvr-core.c | |||
@@ -78,7 +78,8 @@ void hdpvr_delete(struct hdpvr_device *dev) | |||
78 | 78 | ||
79 | static void challenge(u8 *bytes) | 79 | static void challenge(u8 *bytes) |
80 | { | 80 | { |
81 | u64 *i64P, tmp64; | 81 | __le64 *i64P; |
82 | u64 tmp64; | ||
82 | uint i, idx; | 83 | uint i, idx; |
83 | 84 | ||
84 | for (idx = 0; idx < 32; ++idx) { | 85 | for (idx = 0; idx < 32; ++idx) { |
@@ -106,10 +107,10 @@ static void challenge(u8 *bytes) | |||
106 | for (i = 0; i < 3; i++) | 107 | for (i = 0; i < 3; i++) |
107 | bytes[1] *= bytes[6] + 1; | 108 | bytes[1] *= bytes[6] + 1; |
108 | for (i = 0; i < 3; i++) { | 109 | for (i = 0; i < 3; i++) { |
109 | i64P = (u64 *)bytes; | 110 | i64P = (__le64 *)bytes; |
110 | tmp64 = le64_to_cpup(i64P); | 111 | tmp64 = le64_to_cpup(i64P); |
111 | tmp64 <<= bytes[7] & 0x0f; | 112 | tmp64 = tmp64 + (tmp64 << (bytes[7] & 0x0f)); |
112 | *i64P += cpu_to_le64(tmp64); | 113 | *i64P = cpu_to_le64(tmp64); |
113 | } | 114 | } |
114 | break; | 115 | break; |
115 | } | 116 | } |
@@ -301,8 +302,6 @@ static int hdpvr_probe(struct usb_interface *interface, | |||
301 | goto error; | 302 | goto error; |
302 | } | 303 | } |
303 | 304 | ||
304 | dev->workqueue = 0; | ||
305 | |||
306 | /* init video transfer queues first of all */ | 305 | /* init video transfer queues first of all */ |
307 | /* to prevent oops in hdpvr_delete() on error paths */ | 306 | /* to prevent oops in hdpvr_delete() on error paths */ |
308 | INIT_LIST_HEAD(&dev->free_buff_list); | 307 | INIT_LIST_HEAD(&dev->free_buff_list); |