From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 24 Sep 2012 00:42:12 +0000 (-0300)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20120925~82^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0421fb6ef6581639ede08f20d56a5d6d29d93baf;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (155 commits)
  [media] stv090x: add support for multistream
  [media] DocBook: Multistream support
  [media] dvb_frontend: add multistream support
  [media] ce6230: use Kernel dev_foo() logging
  [media] ec168: use Kernel dev_foo() logging
  [media] gl861: use Kernel dev_foo() logging
  [media] au6610: use Kernel dev_foo() logging
  [media] af9035: use Kernel dev_foo() logging
  [media] af9015: correct few error codes
  [media] af9015: improve af9015_eeprom_hash()
  [media] af9015: use Kernel dev_foo() logging
  [media] rtl2830: declare two tables as constant
  [media] rtl2830: use .get_if_frequency()
  [media] rtl2830: use Kernel dev_foo() logging
  [media] hd29l2: use Kernel dev_foo() logging
  [media] ec100: improve I2C routines
  [media] ec100: use Kernel dev_foo() logging
  [media] af9013: use Kernel dev_foo() logging
  [media] af9033: use Kernel dev_foo() logging
  [media] ec168: declare MODULE_FIRMWARE
  ...
---

0421fb6ef6581639ede08f20d56a5d6d29d93baf
diff --cc drivers/media/i2c/m5mols/m5mols_core.c
index 8bf6599a4c1a,0f521f57e8e5..6ca6a7f9de15
--- a/drivers/media/i2c/m5mols/m5mols_core.c
+++ b/drivers/media/i2c/m5mols/m5mols_core.c
@@@ -937,11 -937,9 +937,11 @@@ static int __devinit m5mols_probe(struc
  	if (!ret)
  		ret = m5mols_init_controls(sd);
  
- 	m5mols_sensor_power(info, false);
+ 	ret = m5mols_sensor_power(info, false);
  	if (!ret)
  		return 0;
 +out_irq:
 +	free_irq(client->irq, sd);
  out_me:
  	media_entity_cleanup(&sd->entity);
  out_reg: