forked from mirrors/linux
		
	ipmi: kcs_bmc: don't change device name
kcs_bmc_alloc(...) calls dev_set_name(...) which is incorrect as most bus driver frameworks, platform_driver in particular, assume that they are able to set the device name themselves. Signed-off-by: Benjamin Fair <benjaminfair@google.com> Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
		
							parent
							
								
									9f8f16c86e
								
							
						
					
					
						commit
						cd2315d471
					
				
					 1 changed files with 4 additions and 3 deletions
				
			
		| 
						 | 
					@ -16,6 +16,8 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "kcs_bmc.h"
 | 
					#include "kcs_bmc.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define DEVICE_NAME "ipmi-kcs"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define KCS_MSG_BUFSIZ    1000
 | 
					#define KCS_MSG_BUFSIZ    1000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define KCS_ZERO_DATA     0
 | 
					#define KCS_ZERO_DATA     0
 | 
				
			||||||
| 
						 | 
					@ -429,8 +431,6 @@ struct kcs_bmc *kcs_bmc_alloc(struct device *dev, int sizeof_priv, u32 channel)
 | 
				
			||||||
	if (!kcs_bmc)
 | 
						if (!kcs_bmc)
 | 
				
			||||||
		return NULL;
 | 
							return NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	dev_set_name(dev, "ipmi-kcs%u", channel);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	spin_lock_init(&kcs_bmc->lock);
 | 
						spin_lock_init(&kcs_bmc->lock);
 | 
				
			||||||
	kcs_bmc->channel = channel;
 | 
						kcs_bmc->channel = channel;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -444,7 +444,8 @@ struct kcs_bmc *kcs_bmc_alloc(struct device *dev, int sizeof_priv, u32 channel)
 | 
				
			||||||
		return NULL;
 | 
							return NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	kcs_bmc->miscdev.minor = MISC_DYNAMIC_MINOR;
 | 
						kcs_bmc->miscdev.minor = MISC_DYNAMIC_MINOR;
 | 
				
			||||||
	kcs_bmc->miscdev.name = dev_name(dev);
 | 
						kcs_bmc->miscdev.name = devm_kasprintf(dev, GFP_KERNEL, "%s%u",
 | 
				
			||||||
 | 
										       DEVICE_NAME, channel);
 | 
				
			||||||
	kcs_bmc->miscdev.fops = &kcs_bmc_fops;
 | 
						kcs_bmc->miscdev.fops = &kcs_bmc_fops;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return kcs_bmc;
 | 
						return kcs_bmc;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue