diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-10-17 10:38:33 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-10-17 10:38:33 +0200 |
commit | 84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (patch) | |
tree | 6774218cb21d5ffbe704d6ad6beadc8559aaed1c /drivers/media/radio | |
parent | 57e35381bc13e6f18ac1ec255ca61ba1a5103e13 (diff) | |
parent | aa73aec6c385e2c797ac25cc7ccf0318031de7c8 (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/media/radio')
-rw-r--r-- | drivers/media/radio/si470x/radio-si470x-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c index 67a4ec8768a6..4ce541a5eb47 100644 --- a/drivers/media/radio/si470x/radio-si470x-i2c.c +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c @@ -395,7 +395,7 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client, radio->registers[POWERCFG] = POWERCFG_ENABLE; if (si470x_set_register(radio, POWERCFG) < 0) { retval = -EIO; - goto err_all; + goto err_video; } msleep(110); |