Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 288813
b: refs/heads/master
c: ef77d83
h: refs/heads/master
i:
  288811: 71fe901
v: v3
  • Loading branch information
Wolfram Sang authored and Greg Kroah-Hartman committed Feb 24, 2012
1 parent 67530dd commit 5ea0b37
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 838d51bfa31540d474b9562056379b6325ec07d7
refs/heads/master: ef77d83fd7a2f37a20d9e37ac156f18e7e105c75
2 changes: 0 additions & 2 deletions trunk/drivers/misc/fsa9480.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ static int __devinit fsa9480_probe(struct i2c_client *client,
if (client->irq)
free_irq(client->irq, usbsw);
fail1:
i2c_set_clientdata(client, NULL);
kfree(usbsw);
return ret;
}
Expand All @@ -468,7 +467,6 @@ static int __devexit fsa9480_remove(struct i2c_client *client)
struct fsa9480_usbsw *usbsw = i2c_get_clientdata(client);
if (client->irq)
free_irq(client->irq, usbsw);
i2c_set_clientdata(client, NULL);

sysfs_remove_group(&client->dev.kobj, &fsa9480_group);
device_init_wakeup(&client->dev, 0);
Expand Down

0 comments on commit 5ea0b37

Please sign in to comment.