diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 06:08:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 06:08:20 +0200 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/arm/mach-omap2/usb-tusb6010.c | |
| parent | The patch adds support for the PCI cards: PCIcan and PCIcanx (1, 2 or 4 chann... (diff) | |
| parent | pkt_sched: gen_estimator: use 64 bit intermediate counters for bps (diff) | |
| download | linux-bb803cfbecb03a0cf8dc7e1864f18dda6631af00.tar.xz linux-bb803cfbecb03a0cf8dc7e1864f18dda6631af00.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/arm/mach-omap2/usb-tusb6010.c')
| -rw-r--r-- | arch/arm/mach-omap2/usb-tusb6010.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index 15e509013def..8df55f40f4c0 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c @@ -187,7 +187,7 @@ int tusb6010_platform_retime(unsigned is_refclk) unsigned sysclk_ps; int status; - if (!refclk_psec) + if (!refclk_psec || sysclk_ps == 0) return -ENODEV; sysclk_ps = is_refclk ? refclk_psec : TUSB6010_OSCCLK_60; |