Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325169
b: refs/heads/master
c: 07766ab
h: refs/heads/master
i:
  325167: 5ae66a5
v: v3
  • Loading branch information
Jens Taprogge authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 3bc1622 commit eef79da
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 939c37a3c9da8bc23edbbfc01674c1c472a3ad1d
refs/heads/master: 07766ab0256c0870746dae2362625e64e8968fc7
11 changes: 8 additions & 3 deletions trunk/drivers/staging/ipack/ipack.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ struct ipack_device *ipack_device_register(struct ipack_bus_device *bus,
dev_set_name(&dev->dev,
"ipack-dev.%u.%u", dev->bus_nr, dev->slot);

if (bus->ops->set_clockrate(dev, 8))
dev_warn(&dev->dev, "failed to switch to 8 MHz operation for reading of device ID.\n");

ret = ipack_device_read_id(dev);
if (ret < 0) {
dev_err(&dev->dev, "error reading device id section.\n");
Expand All @@ -385,9 +388,11 @@ struct ipack_device *ipack_device_register(struct ipack_bus_device *bus,
}

/* if the device supports 32 MHz operation, use it. */
ret = bus->ops->set_clockrate(dev, dev->speed_32mhz ? 32 : 8);
if (ret < 0)
dev_err(&dev->dev, "failed to perform set_clock_rate operation.\n");
if (dev->speed_32mhz) {
ret = bus->ops->set_clockrate(dev, 32);
if (ret < 0)
dev_err(&dev->dev, "failed to switch to 32 MHz operation.\n");
}

ret = device_register(&dev->dev);
if (ret < 0) {
Expand Down

0 comments on commit eef79da

Please sign in to comment.