git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugzilla-11715' into test
[sfrench/cifs-2.6.git]
/
drivers
/
ieee1394
/
csr1212.c
diff --git
a/drivers/ieee1394/csr1212.c
b/drivers/ieee1394/csr1212.c
index 9f95337139e3144424aba9c2e452939563f24586..5e38a68b8af279b0f6ad5a1280ef74db312f5730 100644
(file)
--- a/
drivers/ieee1394/csr1212.c
+++ b/
drivers/ieee1394/csr1212.c
@@
-84,7
+84,7
@@
static const u8 csr1212_key_id_type_map[0x30] = {
#define quads_to_bytes(_q) ((_q) * sizeof(u32))
-#define bytes_to_quads(_b)
(((_b) + sizeof(u32) - 1) /
sizeof(u32))
+#define bytes_to_quads(_b)
DIV_ROUND_UP(_b,
sizeof(u32))
static void free_keyval(struct csr1212_keyval *kv)
{