Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 02c83595b86480ee4d61665beb13f76685d40239

Authored by David Brownell
Committed by Linus Torvalds
1 parent fd76bab2fa
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

at91_cf, minor fix 

This is a minor correctness fix: since the at91_cf driver probe() routine
is in the init section, it should use platform_driver_probe() instead of
leaving that pointer around in the driver struct after init section
removal.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

drivers/pcmcia/at91_cf.c
Diff comments   View file @ 02c8359
... ... @@ -360,7 +360,6 @@
360 360 .name = (char *) driver_name,
361 361 .owner = THIS_MODULE,
362 362 },
363   - .probe = at91_cf_probe,
364 363 .remove = __exit_p(at91_cf_remove),
365 364 .suspend = at91_cf_suspend,
366 365 .resume = at91_cf_resume,
... ... @@ -370,7 +369,7 @@
370 369  
371 370 static int __init at91_cf_init(void)
372 371 {
373   - return platform_driver_register(&at91_cf_driver);
  372 + return platform_driver_probe(&at91_cf_driver, at91_cf_probe);
374 373 }
375 374 module_init(at91_cf_init);
376 375