diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index eaa2a94d18be4e46b187de7b5d5f9ad92245caa3..dd06c18495eb6f96c52fd33c4a9995a6e7af9c3e 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -828,7 +828,7 @@ static void r592_remove(struct pci_dev *pdev)
 	/* Stop the processing thread.
 	That ensures that we won't take any more requests */
 	kthread_stop(dev->io_thread);
-
+	del_timer_sync(&dev->detect_timer);
 	r592_enable_device(dev, false);
 
 	while (!error && dev->req) {
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 3480d90301083177df47140157b2305b4d061012..cd66830ad49ff6ba524b319698b4876827b1f4c2 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -404,6 +404,8 @@ bool memcg_low_priority_scan_tasks(int (*)(struct task_struct *, void *),
 void memcg_print_bad_task(struct oom_control *oc);
 extern int sysctl_memcg_qos_handler(struct ctl_table *table,
 		int write, void __user *buffer, size_t *length, loff_t *ppos);
+#else
+void memcg_print_bad_task(struct oom_control *oc);
 #endif
 
 /*
@@ -1679,6 +1681,10 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,
 {
 	return 0;
 }
+
+static inline void memcg_print_bad_task(struct oom_control *oc)
+{
+}
 #endif /* CONFIG_MEMCG */
 
 /* idx can be of type enum memcg_stat_item or node_stat_item */