Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317766
b: refs/heads/master
c: 0932966
h: refs/heads/master
v: v3
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 5d47645 commit bd6fa60
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 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: e7ecb0fb40a5358646888720848787da34cfa33d
refs/heads/master: 0932966b1ca03217c6e0c18375867b1a99ee5af0
8 changes: 2 additions & 6 deletions trunk/drivers/staging/ccg/ccg.c
Original file line number Diff line number Diff line change
Expand Up @@ -564,9 +564,7 @@ static int rndis_function_bind_config(struct ccg_usb_function *f,
return -1;
}

pr_info("%s MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", __func__,
rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2],
rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]);
pr_info("%s MAC: %pM\n", __func__, rndis->ethaddr);

ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis");
if (ret) {
Expand Down Expand Up @@ -654,9 +652,7 @@ static ssize_t rndis_ethaddr_show(struct device *dev,
{
struct ccg_usb_function *f = dev_get_drvdata(dev);
struct rndis_function_config *rndis = f->config;
return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n",
rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2],
rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]);
return sprintf(buf, "%pM\n", rndis->ethaddr);
}

static ssize_t rndis_ethaddr_store(struct device *dev,
Expand Down

0 comments on commit bd6fa60

Please sign in to comment.