From 3fc13dcd6cf4cd7e314090215b57ed45f30b4d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= Date: Mon, 30 Jul 2012 21:38:54 +0200 Subject: [PATCH] --- yaml --- r: 323441 b: refs/heads/master c: baacf9c5d2e631e7c940527ad670c8d4b019da81 h: refs/heads/master i: 323439: 0b2e4ab7f634fa1f9789258a991effc2af87b7c4 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-picolcd_debugfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b32e2aa37709..a34ab717beda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b07072e6a27253b5eb7d21049a108449920b4c50 +refs/heads/master: baacf9c5d2e631e7c940527ad670c8d4b019da81 diff --git a/trunk/drivers/hid/hid-picolcd_debugfs.c b/trunk/drivers/hid/hid-picolcd_debugfs.c index ff746456823d..f2491fa53e2f 100644 --- a/trunk/drivers/hid/hid-picolcd_debugfs.c +++ b/trunk/drivers/hid/hid-picolcd_debugfs.c @@ -135,7 +135,7 @@ static ssize_t picolcd_debug_eeprom_write(struct file *f, const char __user *u, memset(raw_data, 0, sizeof(raw_data)); raw_data[0] = *off & 0xff; raw_data[1] = (*off >> 8) & 0xff; - raw_data[2] = min((size_t)20, s); + raw_data[2] = min_t(size_t, 20, s); if (*off + raw_data[2] > 0xff) raw_data[2] = 0x100 - *off; @@ -370,7 +370,7 @@ static const struct file_operations picolcd_debug_flash_fops = { /* * Helper code for HID report level dumping/debugging */ -static const char *error_codes[] = { +static const char * const error_codes[] = { "success", "parameter missing", "data_missing", "block readonly", "block not erasable", "block too big", "section overflow", "invalid command length", "invalid data length",