Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8bc53b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents 64d27069 8fc63fe9

sound/soc/codecs/ssm2602.c

+5 −5
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ SOC_DOUBLE_R("Capture Volume", SSM2602_LINVOL, SSM2602_RINVOL, 0, 31, 0), 
SOC_DOUBLE_R("Capture Switch", SSM2602_LINVOL, SSM2602_RINVOL, 7, 1, 1),



SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0),

SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 7, 1, 0),

SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 8, 1, 0),

SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1),



SOC_SINGLE("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1),
@@ -552,7 +552,7 @@ static struct snd_soc_codec_driver soc_codec_dev_ssm2602 = { 
	.suspend =	ssm2602_suspend,

	.resume =	ssm2602_resume,

	.set_bias_level = ssm2602_set_bias_level,

	.reg_cache_size = sizeof(ssm2602_reg),

	.reg_cache_size = ARRAY_SIZE(ssm2602_reg),

	.reg_word_size = sizeof(u16),

	.reg_cache_default = ssm2602_reg,

};
@@ -601,7 +601,7 @@ static struct spi_driver ssm2602_spi_driver = { 
 *    low  = 0x1a

 *    high = 0x1b

 */

static int ssm2602_i2c_probe(struct i2c_client *i2c,

static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *id)

{

	struct ssm2602_priv *ssm2602;
@@ -621,7 +621,7 @@ static int ssm2602_i2c_probe(struct i2c_client *i2c, 
	return ret;

}



static int ssm2602_i2c_remove(struct i2c_client *client)

static int __devexit ssm2602_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	kfree(i2c_get_clientdata(client));
@@ -641,7 +641,7 @@ static struct i2c_driver ssm2602_i2c_driver = { 
		.owner = THIS_MODULE,

	},

	.probe = ssm2602_i2c_probe,

	.remove = ssm2602_i2c_remove,

	.remove = __devexit_p(ssm2602_i2c_remove),

	.id_table = ssm2602_i2c_id,

};

#endif