diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/mxc_i2c.c | 4 | ||||
| -rw-r--r-- | drivers/usb/core/hcd.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/i2c/busses/mxc_i2c.c b/drivers/i2c/busses/mxc_i2c.c index f051419f02bc..0a43cdc88ab1 100644 --- a/drivers/i2c/busses/mxc_i2c.c +++ b/drivers/i2c/busses/mxc_i2c.c @@ -705,12 +705,8 @@ static int mxci2c_probe(struct platform_device *pdev) } } if (mxc_i2c->clkdiv == -1) { - i--; mxc_i2c->clkdiv = 0x1F; /* Use max divider */ } - dev_dbg(&pdev->dev, "i2c speed is %d/%d = %d bps, reg val = 0x%02X\n", - clk_freq, i2c_clk_table[i].div, - clk_freq / i2c_clk_table[i].div, mxc_i2c->clkdiv); /* * Set the adapter information diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 3208360664c8..5650778ef001 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -117,7 +117,7 @@ static inline int is_root_hub(struct usb_device *udev) return (udev->parent == NULL); } -#if CONFIG_PM +#ifdef CONFIG_PM extern int usb_host_wakeup_irq(struct device *wkup_dev); extern void usb_host_set_wakeup(struct device *wkup_dev, bool para); #endif @@ -1730,6 +1730,8 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd) local_irq_save(flags); if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) { + +#ifdef CONFIG_PM /* if receive a remote wakeup interrrupt after suspend */ if (usb_host_wakeup_irq(hcd->self.controller)) { /* disable remote wake up irq */ @@ -1738,6 +1740,7 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd) hcd->driver->irq(hcd); rc = IRQ_HANDLED; } else +#endif rc = IRQ_NONE; } else if (unlikely(hcd->state == HC_STATE_HALT)) { rc = IRQ_NONE; |