aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 1a3c963dc48a..7d215eaa1370 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -465,15 +465,13 @@ EXPORT_SYMBOL_GPL(spi_unregister_master);
465 */ 465 */
466struct spi_master *spi_busnum_to_master(u16 bus_num) 466struct spi_master *spi_busnum_to_master(u16 bus_num)
467{ 467{
468 if (bus_num) { 468 char name[9];
469 char name[8]; 469 struct kobject *bus;
470 struct kobject *bus; 470
471 471 snprintf(name, sizeof name, "spi%u", bus_num);
472 snprintf(name, sizeof name, "spi%u", bus_num); 472 bus = kset_find_obj(&spi_master_class.subsys.kset, name);
473 bus = kset_find_obj(&spi_master_class.subsys.kset, name); 473 if (bus)
474 if (bus) 474 return container_of(bus, struct spi_master, cdev.kobj);
475 return container_of(bus, struct spi_master, cdev.kobj);
476 }
477 return NULL; 475 return NULL;
478} 476}
479EXPORT_SYMBOL_GPL(spi_busnum_to_master); 477EXPORT_SYMBOL_GPL(spi_busnum_to_master);