projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
core
/
subdev
/
therm
/
ic.c
diff --git
a/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
b/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
index 13b850076443a82e30e8cf081c25c615e73bb9ac..e44ed7b93c6d88db3826a6c6dcb13efd5429385a 100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
+++ b/
drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
@@
-41,7
+41,8
@@
probe_monitoring_device(struct nouveau_i2c_port *i2c,
if (!client)
return false;
- if (!client->driver || client->driver->detect(client, info)) {
+ if (!client->dev.driver ||
+ to_i2c_driver(client->dev.driver)->detect(client, info)) {
i2c_unregister_device(client);
return false;
}