Commit 93e76fbc authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents dcfae049 7405ed28
...@@ -60,8 +60,10 @@ static dev_link_t *ixj_attach(void) ...@@ -60,8 +60,10 @@ static dev_link_t *ixj_attach(void)
link->conf.Vcc = 50; link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
link->priv = kmalloc(sizeof(struct ixj_info_t), GFP_KERNEL); link->priv = kmalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
if (!link->priv) if (!link->priv) {
kfree(link);
return NULL; return NULL;
}
memset(link->priv, 0, sizeof(struct ixj_info_t)); memset(link->priv, 0, sizeof(struct ixj_info_t));
/* Register with Card Services */ /* Register with Card Services */
link->next = dev_list; link->next = dev_list;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment