diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 16:58:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 16:58:01 -0500 |
commit | a5e63931fd36b7c24e383106ac0f4523cf179206 (patch) | |
tree | b4a625ed4a025a3030dc7986f44fc7a92cdc6358 /drivers/staging | |
parent | 970965270315e15b3ec3a3e0d734fb03b85f6875 (diff) | |
parent | e49bd72f9cfba9f0d0204f961d036cd0c7e37f2e (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250
staging/go7007: Fix compilation by re-adding the missing s2250-loader.h
V4L/DVB (13530): Fix wrong parameter order in memset
V4L/DVB (13481): sh_mobile_ceu_camera: fix compile warning
V4L/DVB (13436): cxusb: Fix hang on DViCO FusionHDTV DVB-T Dual Digital 4 (rev 1)
V4L/DVB (13412): SMS_SIANO_MDTV should depend on HAS_DMA
V4L/DVB (13372a): MAINTAINERS: addition of gspca_gl860 driver
V4L/DVB (13371): davinci: remove stray duplicate config pointer
V4L/DVB (13366): em28xx: fix Reddo DVB-C USB TV Box GPIO
V4L/DVB (13345): soc-camera: sh_mobile_ceu_camera: call pm_runtime_disable
V4L/DVB (13344): soc-camera: properly initialise the device object when reusing
V4L/DVB (13343): v4l: add more missing linux/sched.h includes
V4L/DVB (13321): radio-gemtek-pci: fix double mutex_lock
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/go7007/s2250-board.c | 4 | ||||
-rw-r--r-- | drivers/staging/go7007/s2250-loader.h | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c index 8c85a9c3665a..f4a6541c3e60 100644 --- a/drivers/staging/go7007/s2250-board.c +++ b/drivers/staging/go7007/s2250-board.c | |||
@@ -261,7 +261,7 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val) | |||
261 | 261 | ||
262 | memset(buf, 0xcd, 6); | 262 | memset(buf, 0xcd, 6); |
263 | usb = go->hpi_context; | 263 | usb = go->hpi_context; |
264 | if (down_interruptible(&usb->i2c_lock) != 0) { | 264 | if (mutex_lock_interruptible(&usb->i2c_lock) != 0) { |
265 | printk(KERN_INFO "i2c lock failed\n"); | 265 | printk(KERN_INFO "i2c lock failed\n"); |
266 | kfree(buf); | 266 | kfree(buf); |
267 | return -EINTR; | 267 | return -EINTR; |
@@ -270,7 +270,7 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val) | |||
270 | kfree(buf); | 270 | kfree(buf); |
271 | return -EFAULT; | 271 | return -EFAULT; |
272 | } | 272 | } |
273 | up(&usb->i2c_lock); | 273 | mutex_unlock(&usb->i2c_lock); |
274 | 274 | ||
275 | *val = (buf[0] << 8) | buf[1]; | 275 | *val = (buf[0] << 8) | buf[1]; |
276 | kfree(buf); | 276 | kfree(buf); |
diff --git a/drivers/staging/go7007/s2250-loader.h b/drivers/staging/go7007/s2250-loader.h new file mode 100644 index 000000000000..b7c301af16cc --- /dev/null +++ b/drivers/staging/go7007/s2250-loader.h | |||
@@ -0,0 +1,24 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2005-2006 Micronas USA Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License (Version 2) as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program; if not, write to the Free Software Foundation, | ||
15 | * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
16 | */ | ||
17 | |||
18 | #ifndef _S2250_LOADER_H_ | ||
19 | #define _S2250_LOADER_H_ | ||
20 | |||
21 | extern int s2250loader_init(void); | ||
22 | extern void s2250loader_cleanup(void); | ||
23 | |||
24 | #endif | ||