diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 | 
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /drivers/hid/hid-magicmouse.c | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 10 | 
1 files changed, 1 insertions, 9 deletions
| diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index a5eda4c8127a..0ec91c18a421 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -501,17 +501,9 @@ static int magicmouse_probe(struct hid_device *hdev,  	}  	report->size = 6; -	/* -	 * The device reponds with 'invalid report id' when feature -	 * report switching it into multitouch mode is sent to it. -	 * -	 * This results in -EIO from the _raw low-level transport callback, -	 * but there seems to be no other way of switching the mode. -	 * Thus the super-ugly hacky success check below. -	 */  	ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),  			HID_FEATURE_REPORT); -	if (ret != -EIO) { +	if (ret != sizeof(feature)) {  		hid_err(hdev, "unable to request touch data (%d)\n", ret);  		goto err_stop_hw;  	} | 
