diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-12 13:52:22 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 13:52:22 +0400 |
| commit | e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch) | |
| tree | 3558f68717c70a67e18c3274bb17709a353d036f /drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | |
| parent | 30129cf28a5c99f9cb7c168f0d280f147fd6cc8b (diff) | |
| parent | 3da889b616164bde76a37350cf28e0d17a94e979 (diff) | |
| download | linux-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/i2c/base.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c index a114a0ed7e98..2e98e8a3f1aa 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c @@ -142,6 +142,7 @@ nouveau_i2c_port_create_(struct nouveau_object *parent, /* drop port's i2c subdev refcount, i2c handles this itself */ if (ret == 0) { list_add_tail(&port->head, &i2c->ports); + atomic_dec(&parent->refcount); atomic_dec(&engine->refcount); } |