Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b89d5f17d4b02ae9f3a691c2cb260e1929c6261b

Authored by Axel Lin
Committed by Linus Torvalds
1 parent c53252b780
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

drivers/misc/fsa9480.c: fix a leak of the IRQ during init failure 

Make sure we are passing the same cookie in all calls to
request_threaded_irq() and free_irq().

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Donggeun Kim <dg77.kim@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/misc/fsa9480.c
Diff comments   View file @ b89d5f1
... ... @@ -455,7 +455,7 @@
455 455  
456 456 fail2:
457 457 if (client->irq)
458   - free_irq(client->irq, NULL);
  458 + free_irq(client->irq, usbsw);
459 459 fail1:
460 460 i2c_set_clientdata(client, NULL);
461 461 kfree(usbsw);
... ... @@ -466,7 +466,7 @@
466 466 {
467 467 struct fsa9480_usbsw *usbsw = i2c_get_clientdata(client);
468 468 if (client->irq)
469   - free_irq(client->irq, NULL);
  469 + free_irq(client->irq, usbsw);
470 470 i2c_set_clientdata(client, NULL);
471 471  
472 472 sysfs_remove_group(&client->dev.kobj, &fsa9480_group);