diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-02 13:38:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-02 13:38:40 -0700 |
| commit | 9da06237e8cbb2f20a35adf23af8c7bb3b245804 (patch) | |
| tree | f65b0944b4f3fe43070f3a10676fe2062456b007 /drivers/char/random.c | |
| parent | 6fa93fc89f5e5641c0ad1be533b016e065cbf04d (diff) | |
| parent | ee76c85f715377aec3b0115e48b7d66a726ffdea (diff) | |
Merge "Merge android-4.4.129 (b1c4836) into msm-4.4"
Diffstat (limited to 'drivers/char/random.c')
| -rw-r--r-- | drivers/char/random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index bd9fc2baa6aa..dffd06a3bb76 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -724,7 +724,7 @@ retry: static int credit_entropy_bits_safe(struct entropy_store *r, int nbits) { - const int nbits_max = (int)(~0U >> (ENTROPY_SHIFT + 1)); + const int nbits_max = r->poolinfo->poolwords * 32; if (nbits < 0) return -EINVAL; |