git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
mxsfb
/
mxsfb_drv.c
diff --git
a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 2393e6d16ffd4d4118335a018747e218755cb8e9..88ba003979e6b841cce82bd390282335ebb13028 100644
(file)
--- a/
drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/
drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@
-417,7
+417,7
@@
static int mxsfb_probe(struct platform_device *pdev)
err_unload:
mxsfb_unload(drm);
err_free:
err_unload:
mxsfb_unload(drm);
err_free:
- drm_dev_
unref
(drm);
+ drm_dev_
put
(drm);
return ret;
}
return ret;
}
@@
-428,7
+428,7
@@
static int mxsfb_remove(struct platform_device *pdev)
drm_dev_unregister(drm);
mxsfb_unload(drm);
drm_dev_unregister(drm);
mxsfb_unload(drm);
- drm_dev_
unref
(drm);
+ drm_dev_
put
(drm);
return 0;
}
return 0;
}