diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 08:37:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 08:37:51 -0400 |
| commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (patch) | |
| tree | f245dd77a3dede97a80f8369d984334b56220752 /drivers/hid/hid-lg4ff.c | |
| parent | fa2bd30159499f441125495ba8d9d57f646ea42a (diff) | |
| parent | 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 (diff) | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-lg4ff.c')
| -rw-r--r-- | drivers/hid/hid-lg4ff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index 4fb4a80928c8..d7947c701f30 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c | |||
| @@ -423,7 +423,7 @@ static void lg4ff_led_set_brightness(struct led_classdev *led_cdev, | |||
| 423 | { | 423 | { |
| 424 | struct device *dev = led_cdev->dev->parent; | 424 | struct device *dev = led_cdev->dev->parent; |
| 425 | struct hid_device *hid = container_of(dev, struct hid_device, dev); | 425 | struct hid_device *hid = container_of(dev, struct hid_device, dev); |
| 426 | struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hid); | 426 | struct lg_drv_data *drv_data = hid_get_drvdata(hid); |
| 427 | struct lg4ff_device_entry *entry; | 427 | struct lg4ff_device_entry *entry; |
| 428 | int i, state = 0; | 428 | int i, state = 0; |
| 429 | 429 | ||
| @@ -458,7 +458,7 @@ static enum led_brightness lg4ff_led_get_brightness(struct led_classdev *led_cde | |||
| 458 | { | 458 | { |
| 459 | struct device *dev = led_cdev->dev->parent; | 459 | struct device *dev = led_cdev->dev->parent; |
| 460 | struct hid_device *hid = container_of(dev, struct hid_device, dev); | 460 | struct hid_device *hid = container_of(dev, struct hid_device, dev); |
| 461 | struct lg_drv_data *drv_data = (struct lg_drv_data *)hid_get_drvdata(hid); | 461 | struct lg_drv_data *drv_data = hid_get_drvdata(hid); |
| 462 | struct lg4ff_device_entry *entry; | 462 | struct lg4ff_device_entry *entry; |
| 463 | int i, value = 0; | 463 | int i, value = 0; |
| 464 | 464 | ||