diff --git a/[refs] b/[refs] index 09462cd28536..e9439f1ee288 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dccf55f4cb011a7552a8a2749a580662f5ed8ed +refs/heads/master: 27130f0cc3ab97560384da437e4621fc4e94f21c diff --git a/trunk/drivers/mfd/wm831x-otp.c b/trunk/drivers/mfd/wm831x-otp.c index f742745ff354..b90f3e06b6c9 100644 --- a/trunk/drivers/mfd/wm831x-otp.c +++ b/trunk/drivers/mfd/wm831x-otp.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -66,6 +67,7 @@ static DEVICE_ATTR(unique_id, 0444, wm831x_unique_id_show, NULL); int wm831x_otp_init(struct wm831x *wm831x) { + char uuid[WM831X_UNIQUE_ID_LEN]; int ret; ret = device_create_file(wm831x->dev, &dev_attr_unique_id); @@ -73,6 +75,12 @@ int wm831x_otp_init(struct wm831x *wm831x) dev_err(wm831x->dev, "Unique ID attribute not created: %d\n", ret); + ret = wm831x_unique_id_read(wm831x, uuid); + if (ret == 0) + add_device_randomness(uuid, sizeof(uuid)); + else + dev_err(wm831x->dev, "Failed to read UUID: %d\n", ret); + return ret; }