Make sure we don't try to mount cleaning up charging mode, avoid spur…

…ious disconnects and clean-up actions when we use g_file_storage

Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>

src/usb_moded-modesetting.c

@@ -337,6 +337,10 @@ int usb_moded_mode_cleanup(const char *module)
 
         if(!strcmp(module, MODULE_MASS_STORAGE)|| !strcmp(module, MODULE_FILE_STORAGE))
         {
+		/* no clean-up needs to be done when we come from charging mode. We need
+		   to check since we use fake mass-storage for charging */
+		if(!strcmp(MODE_CHARGING, get_usb_mode()))
+		  return 0;	
                 mount = find_mounts();
                 if(mount)
                 {

src/usb_moded-modesetting.h

@@ -30,6 +30,7 @@ int set_mass_storage_mode(void);
 int set_ovi_suite_mode(void);
 int set_mtp_mode(void);
 int set_dynamic_mode(struct mode_list_elem *data);
+/* clean up for the mode changes on disconnect */
 int usb_moded_mode_cleanup(const char *module);
 #ifdef NOKIA
 gboolean export_cdrom (gpointer data);

src/usb_moded-modules.c

@@ -165,6 +165,12 @@ int usb_moded_module_cleanup(const char *module)
 	*/
 
 	failure = usb_moded_unload_module(module);
+
+	/* if we have MODULE_MASS_STORAGE it might be MODULE_FILE_STORAGE might
+	   be loaded. So check and unload that one if unloading fails first time */
+	if(failure && !strcmp(MODULE_MASS_STORAGE, module))
+		failure = usb_moded_unload_module(module);
+
 	while(failure)
 	{
 		// SP: up to 2 second sleep -> worth a warning log?

src/usb_moded-modules.h

@@ -43,9 +43,6 @@ int usb_moded_unload_module(const char *module);
 /* find which module is loaded */
 const char * usb_moded_find_module(void);
 
-/* clean up for the mode changes on disconnect */
-int usb_moded_mode_cleanup(const char *module);
-
 /* clean up modules when usb gets disconnected */
 int usb_moded_module_cleanup(const char *module);