---

yaml --- r: 330890 b: refs/heads/master c: e839776 h: refs/heads/master v: v3
git-mirror · Aug 15, 2012 · bbf3c9f · bbf3c9f
1 parent a65cb13
commit bbf3c9f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89e47e35685535c16a20dc7b9cf8f969024232bc
+refs/heads/master: e839776f9dfe1eda232755d5cab6eacc59208b4b
diff --git a/trunk/drivers/media/usb/s2255/s2255drv.c b/trunk/drivers/media/usb/s2255/s2255drv.c
@@ -1861,11 +1861,12 @@ static int s2255_release(struct file *file)
 static int s2255_mmap_v4l(struct file *file, struct vm_area_struct *vma)
 {
 	struct s2255_fh *fh = file->private_data;
-	struct s2255_dev *dev = fh->dev;
+	struct s2255_dev *dev;
 	int ret;
 
 	if (!fh)
 		return -ENODEV;
+	dev = fh->dev;
 	dprintk(4, "%s, vma=0x%08lx\n", __func__, (unsigned long)vma);
 	if (mutex_lock_interruptible(&dev->lock))
 		return -ERESTARTSYS;

diff --git a/trunk/drivers/media/usb/tm6000/tm6000-alsa.c b/trunk/drivers/media/usb/tm6000/tm6000-alsa.c
@@ -487,10 +487,11 @@ static int tm6000_audio_init(struct tm6000_core *dev)
 
 static int tm6000_audio_fini(struct tm6000_core *dev)
 {
-	struct snd_tm6000_card	*chip = dev->adev;
+	struct snd_tm6000_card *chip;
 
 	if (!dev)
 		return 0;
+	chip = dev->adev;
 
 	if (!chip)
 		return 0;

diff --git a/trunk/drivers/media/usb/tm6000/tm6000-input.c b/trunk/drivers/media/usb/tm6000/tm6000-input.c
@@ -319,12 +319,13 @@ static int tm6000_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
 static int __tm6000_ir_int_start(struct rc_dev *rc)
 {
 	struct tm6000_IR *ir = rc->priv;
-	struct tm6000_core *dev = ir->dev;
+	struct tm6000_core *dev;
 	int pipe, size;
 	int err = -ENOMEM;
 
 	if (!ir)
 		return -ENODEV;
+	dev = ir->dev;
 
 	dprintk(2, "%s\n",__func__);