diff options
| -rw-r--r-- | drivers/staging/media/lirc/lirc_zilog.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index 0bf4bb3f0811..567feba0011c 100644 --- a/drivers/staging/media/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c | |||
| @@ -258,7 +258,6 @@ static void release_ir_rx(struct kref *ref) | |||
| 258 | /* Don't put_ir_device(rx->ir) here; lock can't be freed yet */ | 258 | /* Don't put_ir_device(rx->ir) here; lock can't be freed yet */ |
| 259 | ir->rx = NULL; | 259 | ir->rx = NULL; |
| 260 | /* Don't do the kfree(rx) here; we still need to kill the poll thread */ | 260 | /* Don't do the kfree(rx) here; we still need to kill the poll thread */ |
| 261 | return; | ||
| 262 | } | 261 | } |
| 263 | 262 | ||
| 264 | static int put_ir_rx(struct IR_rx *rx, bool ir_devices_lock_held) | 263 | static int put_ir_rx(struct IR_rx *rx, bool ir_devices_lock_held) |
| @@ -512,7 +511,6 @@ static int set_use_inc(void *data) | |||
| 512 | 511 | ||
| 513 | static void set_use_dec(void *data) | 512 | static void set_use_dec(void *data) |
| 514 | { | 513 | { |
| 515 | return; | ||
| 516 | } | 514 | } |
| 517 | 515 | ||
| 518 | /* safe read of a uint32 (always network byte order) */ | 516 | /* safe read of a uint32 (always network byte order) */ |
