diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:27:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:27:54 +0100 |
| commit | 06fb76d5e4d7bec871fc9f492da130b3a94b9952 (patch) | |
| tree | 085c449931f6e54f5ff52070f1a8fb458db71be9 /drivers/atm/zatm.c | |
| parent | 90eeaee38cbacc20a6cfd14d07273f22078b8898 (diff) | |
| parent | 8900747f49c2a7f38239abe710de4a1d1d275591 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-androidlsk-v4.9-18.06-android
Diffstat (limited to 'drivers/atm/zatm.c')
| -rw-r--r-- | drivers/atm/zatm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index 81bfeec67b77..d0fac641e717 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -1151,8 +1151,8 @@ static void eprom_get_byte(struct zatm_dev *zatm_dev, unsigned char *byte, } -static unsigned char eprom_try_esi(struct atm_dev *dev, unsigned short cmd, - int offset, int swap) +static int eprom_try_esi(struct atm_dev *dev, unsigned short cmd, int offset, + int swap) { unsigned char buf[ZEPROM_SIZE]; struct zatm_dev *zatm_dev; |