net/mlx4_core: Reduce harmless SRIOV error message to debug level

[linux-2.6-block.git] / drivers / auxdisplay / ht16k33.c

diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
index f66b45b235b02300e587c0c64f5e34d70de9c538..fbfa5b4cc567ec2b316584a98686b37e00194b27 100644 (file)
--- a/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@ -254,18 +254,22 @@ static bool ht16k33_keypad_scan(struct ht16k33_keypad *keypad)
 {
        const unsigned short *keycodes = keypad->dev->keycode;
        u16 new_state[HT16K33_MATRIX_KEYPAD_MAX_COLS];
-       u8 data[HT16K33_MATRIX_KEYPAD_MAX_COLS * 2];
+       __le16 data[HT16K33_MATRIX_KEYPAD_MAX_COLS];
        unsigned long bits_changed;
        int row, col, code;
+       int rc;
        bool pressed = false;
 
-       if (i2c_smbus_read_i2c_block_data(keypad->client, 0x40, 6, data) != 6) {
-               dev_err(&keypad->client->dev, "Failed to read key data\n");
+       rc = i2c_smbus_read_i2c_block_data(keypad->client, 0x40,
+                                          sizeof(data), (u8 *)data);
+       if (rc != sizeof(data)) {
+               dev_err(&keypad->client->dev,
+                       "Failed to read key data, rc=%d\n", rc);
                return false;
        }
 
        for (col = 0; col < keypad->cols; col++) {
-               new_state[col] = (data[col * 2 + 1] << 8) | data[col * 2];
+               new_state[col] = le16_to_cpu(data[col]);
                if (new_state[col])
                        pressed = true;
                bits_changed = keypad->last_key_state[col] ^ new_state[col];
@@ -278,7 +282,7 @@ static bool ht16k33_keypad_scan(struct ht16k33_keypad *keypad)
                }
        }
        input_sync(keypad->dev);
-       memcpy(keypad->last_key_state, new_state, sizeof(new_state));
+       memcpy(keypad->last_key_state, new_state, sizeof(u16) * keypad->cols);
 
        return pressed;
 }
@@ -353,6 +357,12 @@ static int ht16k33_keypad_probe(struct i2c_client *client,
        err = matrix_keypad_parse_of_params(&client->dev, &rows, &cols);
        if (err)
                return err;
+       if (rows > HT16K33_MATRIX_KEYPAD_MAX_ROWS ||
+           cols > HT16K33_MATRIX_KEYPAD_MAX_COLS) {
+               dev_err(&client->dev, "%u rows or %u cols out of range in DT\n",
+                       rows, cols);
+               return -ERANGE;
+       }
 
        keypad->rows = rows;
        keypad->cols = cols;