diff options
Diffstat (limited to 'drivers/input/joystick/adc-joystick.c')
| -rw-r--r-- | drivers/input/joystick/adc-joystick.c | 15 | 
1 files changed, 8 insertions, 7 deletions
| diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c index 78ebca7d400a..e0cfdc84763f 100644 --- a/drivers/input/joystick/adc-joystick.c +++ b/drivers/input/joystick/adc-joystick.c @@ -222,13 +222,6 @@ static int adc_joystick_probe(struct platform_device *pdev)  	if (error)  		return error; -	input_set_drvdata(input, joy); -	error = input_register_device(input); -	if (error) { -		dev_err(dev, "Unable to register input device\n"); -		return error; -	} -  	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);  	if (IS_ERR(joy->buffer)) {  		dev_err(dev, "Unable to allocate callback buffer\n"); @@ -241,6 +234,14 @@ static int adc_joystick_probe(struct platform_device *pdev)  		return error;  	} +	input_set_drvdata(input, joy); + +	error = input_register_device(input); +	if (error) { +		dev_err(dev, "Unable to register input device\n"); +		return error; +	} +  	return 0;  } |