Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366714
b: refs/heads/master
c: 54d8090
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Mar 23, 2013
1 parent 83c0d0b commit 8e110e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 13828c61e9d3fd293c284fd24077f1f7d0946458
refs/heads/master: 54d80904b4c1f7aa1d569d07ca3e62fba0daf3a2
3 changes: 2 additions & 1 deletion trunk/drivers/media/usb/hdpvr/hdpvr-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

#include <linux/kernel.h>
#include <linux/kconfig.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
Expand Down Expand Up @@ -1238,7 +1239,7 @@ static void hdpvr_device_release(struct video_device *vdev)
v4l2_device_unregister(&dev->v4l2_dev);

/* deregister I2C adapter */
#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
#if IS_ENABLED(CONFIG_I2C)
mutex_lock(&dev->i2c_mutex);
i2c_del_adapter(&dev->i2c_adapter);
mutex_unlock(&dev->i2c_mutex);
Expand Down

0 comments on commit 8e110e7

Please sign in to comment.