Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6a3d0f2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "misc: isa1200: correct overdrive enablement bit shift"

parents 0ee62b55 fd91cfd3

drivers/misc/isa1200.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 *  Copyright (C) 2009 Samsung Electronics

 *  Kyungmin Park <kyungmin.park@samsung.com>

 *  Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.

 *  Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -318,7 +318,7 @@ static int isa1200_setup(struct i2c_client *client) 


	value |= (haptic->pdata->mode_ctrl << 3) |

		(haptic->pdata->overdrive_high << 5) |

		(haptic->pdata->overdrive_en << 5) |

		(haptic->pdata->overdrive_en << 6) |

		(haptic->pdata->chip_en << 7);



	rc = isa1200_write_reg(client, ISA1200_HCTRL0, value);