| Message ID | 1344807757-2217-17-git-send-email-rydberg@euromail.se (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
Acked-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> On Sun, Aug 12, 2012 at 11:42 PM, Henrik Rydberg <rydberg@euromail.se> wrote: > A null test was left behind during the autoloading work; > the test was introduced by 8d179a9e, but was never completely > reverted. > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Henrik Rydberg <rydberg@euromail.se> > --- > drivers/hid/hid-multitouch.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index c400d90..b15133c 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -691,12 +691,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) > struct mt_device *td; > struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */ > > - if (id) { > - for (i = 0; mt_classes[i].name ; i++) { > - if (id->driver_data == mt_classes[i].name) { > - mtclass = &(mt_classes[i]); > - break; > - } > + for (i = 0; mt_classes[i].name ; i++) { > + if (id->driver_data == mt_classes[i].name) { > + mtclass = &(mt_classes[i]); > + break; > } > } > > -- > 1.7.11.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-input" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index c400d90..b15133c 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -691,12 +691,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) struct mt_device *td; struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */ - if (id) { - for (i = 0; mt_classes[i].name ; i++) { - if (id->driver_data == mt_classes[i].name) { - mtclass = &(mt_classes[i]); - break; - } + for (i = 0; mt_classes[i].name ; i++) { + if (id->driver_data == mt_classes[i].name) { + mtclass = &(mt_classes[i]); + break; } }
A null test was left behind during the autoloading work; the test was introduced by 8d179a9e, but was never completely reverted. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> --- drivers/hid/hid-multitouch.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)