On Sun, 22 Feb 2015, Frank Praznik wrote: > Signed-off-by: Frank Praznik <frank.praznik@xxxxxxxxx> > --- > drivers/hid/hid-sony.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c > index 9e0987d..27f67e7 100644 > --- a/drivers/hid/hid-sony.c > +++ b/drivers/hid/hid-sony.c > @@ -805,7 +805,7 @@ union sixaxis_output_report_01 { > #define SIXAXIS_REPORT_0xF2_SIZE 17 > #define SIXAXIS_REPORT_0xF5_SIZE 8 > > -static spinlock_t sony_dev_list_lock; > +static DEFINE_SPINLOCK(sony_dev_list_lock); > static LIST_HEAD(sony_device_list); > static DEFINE_IDA(sony_device_id_allocator); This hunk was already in my tree from earlier today. > > @@ -1965,6 +1965,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) > return -ENOMEM; > } > > + spin_lock_init(&sc->lock); > + > sc->quirks = quirks; > hid_set_drvdata(hdev, sc); > sc->hdev = hdev; I have applied this one from your patch. I have also added a bit of changelog. Thanks, -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html