diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/macintosh/therm_windtunnel.c | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index cbb72eb0426d..6aaa1df1a64e 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -504,7 +504,7 @@ g4fan_init( void ) | |||
| 504 | } | 504 | } |
| 505 | if( !(np=of_find_node_by_name(NULL, "fan")) ) | 505 | if( !(np=of_find_node_by_name(NULL, "fan")) ) |
| 506 | return -ENODEV; | 506 | return -ENODEV; |
| 507 | x.of_dev = of_platform_device_create( np, "temperature" ); | 507 | x.of_dev = of_platform_device_create(np, "temperature", NULL); |
| 508 | of_node_put( np ); | 508 | of_node_put( np ); |
| 509 | 509 | ||
| 510 | if( !x.of_dev ) { | 510 | if( !x.of_dev ) { |