aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2014-10-14 03:55:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-03 18:42:04 -0500
commit51f1741fcc166dd93d38c7a3212f195d84aa67df (patch)
tree5cab5cbd23e43ce474e4dc7e76ea4009c78c5250
parent5e4ccd9ee2508d04a39fa27de9eb7bf65bad7594 (diff)
usb: chipidea: otg_fsm: delete unnecessary 'out of memory' messages
The memory subsystem has already had similar message for it. Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/chipidea/otg_fsm.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
index caaabc58021e..e683595f9e69 100644
--- a/drivers/usb/chipidea/otg_fsm.c
+++ b/drivers/usb/chipidea/otg_fsm.c
@@ -782,11 +782,8 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
782 782
783 otg = devm_kzalloc(ci->dev, 783 otg = devm_kzalloc(ci->dev,
784 sizeof(struct usb_otg), GFP_KERNEL); 784 sizeof(struct usb_otg), GFP_KERNEL);
785 if (!otg) { 785 if (!otg)
786 dev_err(ci->dev,
787 "Failed to allocate usb_otg structure for ci hdrc otg!\n");
788 return -ENOMEM; 786 return -ENOMEM;
789 }
790 787
791 otg->phy = ci->transceiver; 788 otg->phy = ci->transceiver;
792 otg->gadget = &ci->gadget; 789 otg->gadget = &ci->gadget;
@@ -801,11 +798,8 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
801 798
802 ci->fsm_timer = devm_kzalloc(ci->dev, 799 ci->fsm_timer = devm_kzalloc(ci->dev,
803 sizeof(struct ci_otg_fsm_timer_list), GFP_KERNEL); 800 sizeof(struct ci_otg_fsm_timer_list), GFP_KERNEL);
804 if (!ci->fsm_timer) { 801 if (!ci->fsm_timer)
805 dev_err(ci->dev,
806 "Failed to allocate timer structure for ci hdrc otg!\n");
807 return -ENOMEM; 802 return -ENOMEM;
808 }
809 803
810 INIT_LIST_HEAD(&ci->fsm_timer->active_timers); 804 INIT_LIST_HEAD(&ci->fsm_timer->active_timers);
811 retval = ci_otg_init_timers(ci); 805 retval = ci_otg_init_timers(ci);