X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fppc%2Fkeywest.c;h=fb05938dcbd91c5a6f75e4191c1f74835010f4b0;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=272ae38e9b1883154f7574000270a23b84d48b84;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 272ae38e9..fb05938dc 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -64,10 +64,11 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
 	if (strncmp(i2c_device_name(adapter), "mac-io", 6))
 		return 0; /* ignored */
 
-	new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+	new_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
 	if (! new_client)
 		return -ENOMEM;
 
+	memset(new_client, 0, sizeof(*new_client));
 	new_client->addr = keywest_ctx->addr;
 	i2c_set_clientdata(new_client, keywest_ctx);
 	new_client->adapter = adapter;
@@ -117,9 +118,6 @@ int __init snd_pmac_tumbler_post_init(void)
 {
 	int err;
 	
-	if (!keywest_ctx || !keywest_ctx->client)
-		return -ENXIO;
-
 	if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) {
 		snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err);
 		return err;