diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-11 14:46:53 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-11 14:46:53 +0200 |
| commit | 336879b1da97fffc097f77c6d6f818660f2826f0 (patch) | |
| tree | 4ddb4d1c5d2b67fb096c72e41d2a03b01a605041 /drivers/hid/hid-picolcd_debugfs.c | |
| parent | 3d3cbd84300e7be1e53083cac0f6f9c12978ecb4 (diff) | |
| parent | fdcaa1dbb7c6ed419b10fb8cdb5001ab0a00538f (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework
Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.
Conflicts:
drivers/gpu/drm/drm_irq.c
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/hid/hid-picolcd_debugfs.c')
| -rw-r--r-- | drivers/hid/hid-picolcd_debugfs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/hid/hid-picolcd_debugfs.c b/drivers/hid/hid-picolcd_debugfs.c index 024cdf3c229..3c13af68441 100644 --- a/drivers/hid/hid-picolcd_debugfs.c +++ b/drivers/hid/hid-picolcd_debugfs.c @@ -883,16 +883,13 @@ void picolcd_exit_devfs(struct picolcd_data *data) dent = data->debug_reset; data->debug_reset = NULL; - if (dent) - debugfs_remove(dent); + debugfs_remove(dent); dent = data->debug_eeprom; data->debug_eeprom = NULL; - if (dent) - debugfs_remove(dent); + debugfs_remove(dent); dent = data->debug_flash; data->debug_flash = NULL; - if (dent) - debugfs_remove(dent); + debugfs_remove(dent); mutex_destroy(&data->mutex_flash); } |